Trying a new version of the clustering

Basically I tried to reduce the computation by simply removing the line with the for yield and more cleverly compute the same data
Debugging clustering

Trying to make it run faster and debug it
Changing the clustering

So that it is morre robust