Removed state/zip, added geocoder