Add short options; add ability to disable fuzzy matching