Restrict compounding of proper nouns
Add missing forms
Add missing forms