map changes

lots of map changes