Added markercluster + several other changes