Refactor, improve geocoder. Needs browser testing.
Fix specs for geocoder