tidy up, new tilesets, new map