Minor Tweaks and fixes to the display of messages.