Minor fixes in the clustering, and some clearifications