more cluster analysis fixes