Improved clustering algorithm, now 70 times more efficient.