I've gotten a lot of help from Stacy on the early wakings and short naps. My baby wakes at 5:30-5:45 and screams if I try to put him back to sleep. Stacy said that most early wakings are caused by overtiredness. If you think at all that your baby is overtired, cut the awake time down 10-15 min. especially in the morning when their most tired, and see if that helps. If it's a 45 min nap, expect they can stay awake 1Hr 40-50 min. after that. If it's 1 hr+ expect they can stay awake around 2 hours. Your baby is a little younger than mine so maybe even 10-15 shorter awake times if you think necessary. What have you been doing lately on times for awake and naps?