Some updates to chat
Merge pull request #282 from ironbane/chatUpdatez

Some updates to chat