clustering improvements to hide quad trees & make API simpler