Grav functions joined into one

Also caught an error in the spring grav