Comments
Improved formatting of messages
Fix recursion issue in formatting.