Did some stuff, mostly about waking