New command line options, renumbering is now correct with -k and/or -s, code beautified.