this won't help with the night weaning, but maybe the water drinking. as a way to entertain dd while out to dinner, my mom gave her water from the end of a straw. she put it in the glass and held her finger over the tip (to hold the water in) then let the water drip into dd's mouth. she loved this and didn't spill much after a few trys. tonight dh was giving her some water this way, when he noticed suction on the straw. he was holding his finger completely over the top of the straw and dd was able to suck out all the water. so we tried giving her the straw with it in the glass and what do you know - she sucked up the water the first time!!! and everyone sitting near us knew of dd's amazing success :) even if this doesn't help with learning to drink out of a straw, it's a fun way to get water in them and entertaining too! good luck!