Add missing language items and improve some others

see #55
Add TODO