vastly improved cli