Add --text option
New --unique flag
improved error handling