removed gamestate, bugfixes