did some work on the cluster database related things