help in french

I'm planning on leaving little notes written in french in my boyfriend's things.
my french is a little rusty and online translators are not our best friends, so i need your help, guys.

"each night, when i close my eyes, i think of you until i fall asleep"
"chaque nuit, quand je ferme mes yeux, je pense à toi jusqu'à ce que je tombe endormi." (i think babelfish tricked me in the last part)

annnnnd

"i miss you right now"
"tu me manques..."  maintenant? doesn't sound right, but i might be wrong.

thanks!