Now using new (quadtree like) clustering. Seems to be working...