Bugfixes in game