small changes and gamestate