Some updates to chat