added more validations to submission