Auto-unjoining and point keeping, 1st attempt
Fixes to #272