Fine-tune map
Merge branch 'mapCleanUp' into develop