Added changes to clustering code + clouds.
merged some stuff.