Improved wording of warnings and comments