map now scrolls to new unit
map changes to help with scrolling
removed log
merge from master