Add support for messages
Minor touches
Add messages