Fix error warnings
Add new form options