REFACTOR
Fixed a few thingies
Merge branch 'master' of https://github.com/icecavegame/Icecave