Add UsedClusters and fix some small how-did-this-work bugs