Added catch-all to -f, added --uncount, and fixed a bug in --count