bugfixing and some general tidying
Merge branch 'master' of https://github.com/Felty/shiny-octo-dubstep