form validation fixes