Gamestate  enum improvements