forgot to add that yes the curtains are closed..he has his blind down plus light blocking curtains drawn and its still fairly light! the sun sets on the side of the house that his room is on so it sops a lot of light.. we're moving soon so hopefull his new room will be darker.
I feel like the wrapping/dummy coming out/rolling issue is just the current problem but the main problem is that seems to fight every sleep..when he was younger and couldn't roll he'd stay wrapped and keep the dummy in but still fuss and carry on for ages every nap time...he used to do it from 4am onwards which was horrible thankfully he's not too bad during the night now