numerous changes related to unified cli work