Ajusted comments and error messages