Further updates to Clusterpoint support
various improvements