improvements for CLI