Updated jcommander version, Some minor adjustments