doc + CLI fix