fixing map stuff
Merge branch 'mapChanges'