added plot_clusters, improved clustering