Sounds like you are on the right track to me and doing a great job with your little boy. Lovely night time pattern there! RE day sleeps. There isn't a way of actually getting them to sleep longer that I know of, but what I do know is that at this age, sleep patterns do change (in fact they changed every few eeks for me up till about 9-10 months) and also, having 40 minute sleep cycles is very normal and common. It is up to you if you want to start self settling but I think there is plenty of time for that and he may still want/need your help to get to sleep. What happens when he wakes after the 20-40 mins? Do you pick him up straight away? I am only thinking that at 20 mins he may be may making 'awake' noises but isn't awake, just stirring. Or perhaps he is crying loudly? Let us know what he does. Keep up your terrific work with your little man.