Improvements to chat