update cli to match clint/master