minor tweaks, including the fix to prevent joining twice