Chat improvements

more fine tuning