More cleanup, onReturnHelersToDraggees, and magnetStrength