Fixes and additions to TwoObjectKinematic