fixed bugs + new game states stack