Small change to make variable endpoints work better.  Still needs some work.

And note to self:  C/L 37.4mm