fixed forms and validation