Add fix for command line parsing. Simplify processing of jar files