form validation additions and fixes