Fixed some stuff and did a bit of tidying
Merge branch 'master' of github.com:KittyTristy/KittyCraft