minor formatting fix
new test for spline
new test of kinetic surface contribution
minor rearragements