only returns orig nodes in get_cluster, plus other changes