added Cluster, fixed some bugs