make clustering provider configurable
add additional configuration options
cleanup