Options for messages, improvements.