cleanup
add marker clustering support