improved cluster-finding