add support for non-disjoint clustering, add manual clusterer