OK so I am definitely not going to wrap him anymore, because the same day he rolled over wrapped with both arms to his side.

So last night, I only got about 3 hours sleep. I tried not wrapping him and he just thinks its play time. Finally he exhausted himself about 2.30 and fell asleep, but half hour later he was wide awake throwing his arms everywhere and giggling!

All night it was up and down, never lasting more than an hour of sleep, and when he was awake he just wanted to play. Finally I just had to wrap him, but it was much looser than normal, he was so exhausted, just like I was.

It's the arms - they just seem to wake him up if they even move an inch! I also tried just having one arm out.