Gamestate + end of battle fixes