Fix --help, -l, and -V options, update version to 2.3.3.1