we were having sleep problems with our 2.5 yo (now is resolved at the moment, knock on wood). we always give him a drink of water before bed and the cup is in his room where he can access it. we also have a 3 book rule. when it is the last book we say "this is the last book. no more books, etc, etc". sometimes there are tears and then i say, you can go to bed or we can read this last book, etc. now, it is rarely an issue. we also have a 2 tuck in rule so he gets one add'l tuck in after we tuck him in initially. (this is no longer necessary but it worked pretty well when we were having issues). we were very firm in the sleep rules. every night we would say "3 books, 2 tuck-ins". we were very consistent. if he got up, after the 2 tuck-ins we would return him to bed and not say anything (however, this is due to the sleep issues we were having - long story.). he also has this twilight turtle than shows the constellations/moon on his ceiling and is like a night light. he does want another small night line on though. we don't have the potty issue b/c DS is not potty trained so not sure what to do about that.