CLI improvements and documentation