Map only plot + small corrections
removed comment