Cleaned up some code
Added/Fixed some other stuff..
Merge branch 'master' of https://github.com/IVMultiplayer/IVMultiplayer