Actually balance the similarity score - this was missed before
Fix similarity measures that were broken due to refactoring