Even more bugfixes!
Merge branch 'Networking' of https://github.com/Crumbtray/WarGames into Networking