Got rid of small bugs and working with the geocode