GameState fixes and setup for more.