Not sure what changes I made
More misc changes
Merge branch 'map-design' into Github-testing