Fix several errors
Plural
Add missing variable