The `-o` and `-O` options now affect the output for the `-v` switch.
Took care of a couple corner cases involving digits combined with options