Adding more special cases of nouns, including -is and -uo