Daytime naps are in sling/buggy on the move if out. But normally in buggy in living room, if he stirs before I think he's ready to wake I give it a push, he may go back off he may not.
ddas I hear you on the toys. Dd was 2 when ds1 was born and at that age she didn't have things with small parts really, and if she did they were'supervised toys' whereas now at 8+6 there are marbles, beads, bouncy balls, Barbuda shoes, etc etc etc, all over my house. I find myself constantly repeating 'have you mo ed everything out of ds2s reach?!' In a slightly manic manor!