Modified clustering and mapPlot scripts