Fixes, organizing of packets etc.
Merge branch 'master' of https://github.com/chylex/ErebusMod