clustering improvements