Honestly i think you are doing great, it took me MONTHS (years?!) to get to this stage
I would be tempted now to move things along. Something along the following lines.
Tell her that Mommy needs to leave the room while she sleeps as you have jobs etc to do and that if she comes out you will take her back to bed. Of course you will have to be very consistent then in doing that so be sure in your own mind of what you are doing and why. Make it sound positive - she needs to have a lovely long sleep in her cosy bed so that tomorrow she will be happy and can have a fun day because she won't be tired etc etc. She probably won't be too happy about it and things might get tougher for a while but once she understands she will sleep much better.
regarding the nw's, I highly recommend being out of sight while she goes to sleep if you can manage to. she's waking briefly during the night and instead of rolling over and going back to sleep she's checking to see where you've gone to.
some more ideas here
http://babywhispererforums.com/index.php?topic=60390.0My LO can pull his own duvet up but probably couldn't get it over his head. I wouldn't have a problem with him wanting to do that as long as he wasn't overheating but i'd have to question if he was using it as a reason why i had to get up to him.......i'd be tempted to use warmer nightclothes and just give her a sheet and show her how to get under it. And explain that Mommy won't be getting up to do it for her !
hope something there helped