Add missing forms
Restrict compounding
Add abbreviations