improved join messages
fix merge