better marker clusterer and fix geojson cleanup