Improvements to PRIVMSG