Bugfixes to the GameServer
Minor Refactoring