Make the cli work better