More progress on stop_cluster