Bugfixes in Game Logic