validation and error message changes