Changes and fixes to Game class