added MapParser, improved gamestates