fixed some clustering pbs, first draft of cluster look