CLI improvements.