Fixed clustering - now works

Still there is a bug in the graph drawaing,,