modifications to chat manager
Cleanup