Fix errors and start adding geocode information