Fix to make use of clusters and PCA information correctly
Fix to ensure bin numbers remain consistent even with discrete numbers of bins