Bunch of bug fixes and general cleanup.
Merge branch 'master' of github.com:KaiMinato/a-day-in-the-life
Merge branch 'master' of github.com:KaiMinato/a-day-in-the-life
More cleanup.