Improve the clustering algorithm

Megite improved the clustering algorithm, but still lots of work to be done. Thanks for all your reports.