Fixing up some bugs so you can get to the game state