clustering improvements
clustering improvements