Wakeup -> Master

Merge in a bunch of small, not really important changes I accidentally made on wakeup when I meant to make them on master.