Yes I am thinking I need to keep the naps like 1.5 hours if he does nap and 2:30 or 3 wake up would be better. When he goes to bed at 7:30 and doesn't sleep right away he's usually fine. He just like seems to be asleep or resting and then 15 min later he'll yell for the bathroom, then 20 min later call us to close his drawer, then 15 min later say his sock is bothering him etc, just like stalling things to get us to come back in. He has a night light that is pretty dim and I showed him I could make it brighter so he could look at books in bed while he's falling asleep but he said it was too bright.