convert clusters to Cluster class, added cluster persistence, and added some new cluster drawing functions