did a bit more work on GameState, and fixed some bugs in Location