Misc bugfixes and improvements.
Merge branch 'master' of https://github.com/debugman18/UpAndAway