some cleanup, added gamestate and uistate to class generator