fixed improper validations on submit