Add words
Restrict compounding
Add missing forms