Brandon 4/10

fixed more gamestate issues