More cleanup
Merge pull request #23 from datboitom/message-fixes

More cleanup