fix and updates in chat integration