clean up
add support for geocode