Chat Fixes/Clean up