FInished fixes to chat