migrating wake module to 0.6
just formatting / tidying up
merge with origin, hopefully nothing bad happened here. if so, must grab the files from Baltazars previous commit