just a bit of a tidy up and entity stuff
Merge branch 'master' of https://github.com/ProPercivalalb/ErebusMod