At 13 months, we cut out the "bedtime snack." We found that it was contributing to his waking in the night and waking early in the morning. You can read more about those sleep issues here. Ever since then, his sleep (nighttime and naps) have been totally back to normal.
Like I said last time, we don't really operate in "waketimes" anymore. We know he needs 2 naps and we start them around the same time every day. His morning nap is around 1.5 hours and his afternoon nap is around 2 hours. If we calculated waketime, it would be about 2-2.5 hours in the morning and about 2 hours in the afternoon.
We offer him water right before bed, but that's it. After he drinks what he wants, we put him down around 8:00-8:10. There have been a few days this past month when he's just been extremely tired and has gone to bed around 7:45. His total night sleep time ranges anywhere from 12-13 hours.