Removed sqrt splines and shape stuff (doesn't work, so why was it in there?).  Changed some of the water samples to use shifted_force.  Probably should set the defaults to use the damped version now that we sped it up.