master #2 improve plot2map