fixes for main map