Tweaks to the chat client and server