leave/join mechanisms, minor bugfixes