fixed forms and validations, #24