added more form validation