Fixed some issues with the gamestate again.