massive overhaul of the clustering evaluation system