Bug fixes (cluster updates), moved clusterMakerTask to AnnotationTask