+Fixed GameStates class to work with different parts of the game
+Fixed bugs that came with the switch to game states