Continued CM spline improvements