custom clusters: stop when the thresholds are too high
plus some other changes