Improved messages and comments