Join Event active and minor bugs squashed