Clustering experiments and minor bugfixes