More fixes
Gamestate fixes in Vorticon