resolved confusing names; added new gamestate