Bug fixes. Message wrapping now works.