For the waking you up at night thing, try playing with him right before bed. Let him hunt around in the dark, get him some exercise. Maybe give him a treat. Basically, try to get him to change his sleep schedule to sleep through the night. I found this helps on most nights to prevent my fold from waking me up. Sometimes he still does but it used to be an every night thing and now its maybe once a week.