CLI improvements, misc