some minor bug fixes for cases where only one cluster is seen