More work on chat stuff, butfix in TP