Updated some function names. Added Haversine calculation.