Fix lat/lon and added the iri math