Add missing forms
Fix bugs