fix chat; little refinement;