Minor bug fixes, added join/depart events