fix bugs & add new Game modes