Change broadcast to chat, minor tweaks