Comments and error message changes