CLI improvements and refactored settings