Taxonomy fixes (and minor Radar edit)