cluster status verification and other changes