Add more numerals
Add missing forms