lots of changes to da map
merges in the main and map updates
post merge things