Remove -J, -P, and -V as they have long options equivalents. Update documentation, small code cleanups.