some edits to the game class, almost working