Add missing forms
Fix "Andyyn"
Add missing forms