fixed map bugs
fixed merge issues
merge issues
small debugging
fixed merge issues
Fixed map and works