Fixed hilight messages; better join handling