Little improvements to GameState datastructure and navigation logic