menu and gamestate bugs fixed