Working on some UX improvements for CLI