BSplines + minor fixes