fixed up rest of form validation