Fixes and chat addition