Updates to latest map

exodus-2.dmm wouldn't merge normally, so I just redid the map changes.