Lots of indexing improvements incl dealing with pro parte synonyms and doing correct metrics. Adding nub lookup to normalization