Fixed most of the geometry calcs to spherical proj