Improved messages and comments.