Normalize pluralizations; fix