Improve the chat, fix some errors