a few improvements for the chat