Clueless Luke has never really liked being wrappped, but I have persisted in wrapping his arms - leaving legs free to kick. I only wrap him loosely though which seems to send the message it is time for sleep. Luke isn't showing any signs of wanting to roll so haven't worried about dropping it yet. As for sleeping through tips, I would drop the dream feed and just make sure she is good and full at 8.30pm when you put her down. I would also try to resettle if she woke any earlier than 5am. We use dummies here and Luke gets one of those if he wakes up early. I am lucky though he is so huge that I don't have to worry about him eating enough! The other thing that I did was close his bedroom door making his room really dark - thsi seemed to help him not wake fully and gave me a better chance of resettling. I also leave a radio on really low so he has some noise. Not sure if any of this will help but Good Luck!