Working on bugs with game mode