game and game_control updated and tested