diff --git a/src/main/java/rife/bld/operations/AbstractToolProviderOperation.java b/src/main/java/rife/bld/operations/AbstractToolProviderOperation.java
index 68e43f7..0001298 100644
--- a/src/main/java/rife/bld/operations/AbstractToolProviderOperation.java
+++ b/src/main/java/rife/bld/operations/AbstractToolProviderOperation.java
@@ -69,7 +69,7 @@ public void execute() throws Exception {
     /**
      * Adds arguments to pass to the tool.
      *
-     * @param args the argument to add
+     * @param args tbe list of arguments
      * @return this operation
      */
     @SuppressWarnings({"unchecked"})
@@ -81,11 +81,11 @@ public T toolArgs(List<String> args) {
     /**
      * Adds arguments to pass to the tool.
      *
-     * @param arg one or more argument
+     * @param args one or more arguments
      * @return this operation
      */
-    public T toolArgs(String... arg) {
-        return toolArgs(List.of(arg));
+    public T toolArgs(String... args) {
+        return toolArgs(List.of(args));
     }
 
     /**
@@ -100,7 +100,7 @@ public List<String> toolArgs() {
     /**
      * Parses arguments to pass to the tool from the given files.
      *
-     * @param files the list of files
+     * @param files one or more files
      * @return this operation instance
      * @throws FileNotFoundException if a file cannot be found
      */
@@ -111,7 +111,7 @@ public T toolArgsFromFile(String... files) throws IOException {
     /**
      * Parses arguments to pass to the tool from the given files.
      *
-     * @param files the list of files
+     * @param files one or more files
      * @return this operation instance
      * @throws FileNotFoundException if a file cannot be found
      */
@@ -133,7 +133,7 @@ public T toolArgsFromFile(List<File> files) throws IOException {
     /**
      * Parses arguments to pass to the tool from the given files.
      *
-     * @param files the list of files
+     * @param files one or more files
      * @return this operation instance
      * @throws FileNotFoundException if a file cannot be found
      */
diff --git a/src/main/java/rife/bld/operations/JlinkOperation.java b/src/main/java/rife/bld/operations/JlinkOperation.java
index 643e519..498f5c0 100644
--- a/src/main/java/rife/bld/operations/JlinkOperation.java
+++ b/src/main/java/rife/bld/operations/JlinkOperation.java
@@ -28,7 +28,7 @@ public JlinkOperation() {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JlinkOperation cmdFiles(String... files) {
@@ -38,7 +38,7 @@ public JlinkOperation cmdFiles(String... files) {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JlinkOperation cmdFiles(List<File> files) {
@@ -49,7 +49,7 @@ public JlinkOperation cmdFiles(List<File> files) {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JlinkOperation cmdFiles(File... files) {
@@ -59,7 +59,7 @@ public JlinkOperation cmdFiles(File... files) {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JlinkOperation cmdFiles(Path... files) {
@@ -69,7 +69,7 @@ public JlinkOperation cmdFiles(Path... files) {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JlinkOperation cmdFilesPaths(List<Path> files) {
@@ -80,7 +80,7 @@ public JlinkOperation cmdFilesPaths(List<Path> files) {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JlinkOperation cmdFilesStrings(List<String> files) {
diff --git a/src/main/java/rife/bld/operations/JlinkOptions.java b/src/main/java/rife/bld/operations/JlinkOptions.java
index 4ec28f9..6cef875 100644
--- a/src/main/java/rife/bld/operations/JlinkOptions.java
+++ b/src/main/java/rife/bld/operations/JlinkOptions.java
@@ -28,7 +28,7 @@ public class JlinkOptions extends LinkedHashMap<String, String> {
      * <p>
      * Module can also be {@link #ALL_MODULE_PATH}
      *
-     * @param modules one or more module
+     * @param modules one or more modules
      * @return this map of options
      */
     public JlinkOptions addModules(List<String> modules) {
@@ -41,7 +41,7 @@ public JlinkOptions addModules(List<String> modules) {
      * <p>
      * Module can also be {@link #ALL_MODULE_PATH}
      *
-     * @param modules one or more module
+     * @param modules one or more modules
      * @return this map of options
      */
     public JlinkOptions addModules(String... modules) {
@@ -153,7 +153,7 @@ public JlinkOptions launcher(String name, String module, String mainClass) {
     /**
      * Limit the universe of observable modules.
      *
-     * @param modules one or more module
+     * @param modules one or more modules
      * @return this map of options
      */
     public JlinkOptions limitModule(List<String> modules) {
@@ -163,7 +163,7 @@ public JlinkOptions limitModule(List<String> modules) {
     /**
      * Limit the universe of observable modules.
      *
-     * @param modules one or more module
+     * @param modules one or more modules
      * @return this map of options
      */
     public JlinkOptions limitModule(String... modules) {
@@ -325,7 +325,7 @@ public JlinkOptions stripNativeCommands(boolean stripNativeCommands) {
     /**
      * Suggest providers that implement the given service types from the module path.
      *
-     * @param names one or more provider name
+     * @param names one or more provider names
      * @return this map of options
      */
     public JlinkOptions suggestProviders(List<String> names) {
@@ -336,7 +336,7 @@ public JlinkOptions suggestProviders(List<String> names) {
     /**
      * Suggest providers that implement the given service types from the module path.
      *
-     * @param names one or more provider name
+     * @param names one or more provider names
      * @return this map of options
      */
     public JlinkOptions suggestProviders(String... names) {
diff --git a/src/main/java/rife/bld/operations/JmodOperation.java b/src/main/java/rife/bld/operations/JmodOperation.java
index 40010fd..34896bb 100644
--- a/src/main/java/rife/bld/operations/JmodOperation.java
+++ b/src/main/java/rife/bld/operations/JmodOperation.java
@@ -40,7 +40,7 @@ public List<String> cmdFiles() {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JmodOperation cmdFiles(String... files) {
@@ -50,7 +50,7 @@ public JmodOperation cmdFiles(String... files) {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JmodOperation cmdFiles(File... files) {
@@ -61,7 +61,7 @@ public JmodOperation cmdFiles(File... files) {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JmodOperation cmdFiles(Path... files) {
@@ -71,7 +71,7 @@ public JmodOperation cmdFiles(Path... files) {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JmodOperation cmdFilesPaths(List<Path> files) {
@@ -82,7 +82,7 @@ public JmodOperation cmdFilesPaths(List<Path> files) {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JmodOperation cmdFilesStrings(List<String> files) {
diff --git a/src/main/java/rife/bld/operations/JmodOptions.java b/src/main/java/rife/bld/operations/JmodOptions.java
index 4c05b4e..d9e3128 100644
--- a/src/main/java/rife/bld/operations/JmodOptions.java
+++ b/src/main/java/rife/bld/operations/JmodOptions.java
@@ -188,7 +188,7 @@ public JmodOptions dryRun(boolean dryRun) {
     /**
      * Exclude files matching the supplied pattern list.
      *
-     * @param patterns one or more pattern
+     * @param patterns one or more patterns
      * @return the map of options
      */
     public JmodOptions exclude(List<FilePattern> patterns) {
@@ -207,7 +207,7 @@ public JmodOptions exclude(List<FilePattern> patterns) {
     /**
      * Exclude files matching the supplied pattern list.
      *
-     * @param patterns one or more pattern
+     * @param patterns one or more patterns
      * @return the map of options
      */
     public JmodOptions exclude(FilePattern... patterns) {
diff --git a/src/main/java/rife/bld/operations/JpackageOperation.java b/src/main/java/rife/bld/operations/JpackageOperation.java
index e06e42c..d359505 100644
--- a/src/main/java/rife/bld/operations/JpackageOperation.java
+++ b/src/main/java/rife/bld/operations/JpackageOperation.java
@@ -33,7 +33,7 @@ public JpackageOperation() {
      * Additional alternative launchers can be built using this option, and this option can be used to build multiple
      * additional launchers.
      *
-     * @param launchers one or more {@link JpackageOperation.Launcher}
+     * @param launchers one or more {@link Launcher launchers}
      * @return this operation instance
      */
     public JpackageOperation addLauncher(List<Launcher> launchers) {
@@ -49,7 +49,7 @@ public JpackageOperation addLauncher(List<Launcher> launchers) {
      * Additional alternative launchers can be built using this option, and this option can be used to build multiple
      * additional launchers.
      *
-     * @param launchers one or more {@link JpackageOperation.Launcher}
+     * @param launchers one or more {@link Launcher launchers}
      * @return this operation instance
      */
     public JpackageOperation addLauncher(Launcher... launchers) {
@@ -59,7 +59,7 @@ public JpackageOperation addLauncher(Launcher... launchers) {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JpackageOperation cmdFiles(List<File> files) {
@@ -70,7 +70,7 @@ public JpackageOperation cmdFiles(List<File> files) {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JpackageOperation cmdFiles(File... files) {
@@ -80,7 +80,7 @@ public JpackageOperation cmdFiles(File... files) {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JpackageOperation cmdFiles(Path... files) {
@@ -90,7 +90,7 @@ public JpackageOperation cmdFiles(Path... files) {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JpackageOperation cmdFiles(String... files) {
@@ -100,7 +100,7 @@ public JpackageOperation cmdFiles(String... files) {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JpackageOperation cmdFilesPaths(List<Path> files) {
@@ -111,7 +111,7 @@ public JpackageOperation cmdFilesPaths(List<Path> files) {
     /**
      * Read options and/or mode from file(s).
      *
-     * @param files one or more file
+     * @param files one or more files
      * @return this operation instance
      */
     public JpackageOperation cmdFilesStrings(List<String> files) {
diff --git a/src/main/java/rife/bld/operations/JpackageOptions.java b/src/main/java/rife/bld/operations/JpackageOptions.java
index ad5b7b2..19122bf 100644
--- a/src/main/java/rife/bld/operations/JpackageOptions.java
+++ b/src/main/java/rife/bld/operations/JpackageOptions.java
@@ -35,7 +35,7 @@ public JpackageOptions aboutUrl(String url) {
      * (if {@link #module(String, String) module} is specified), or the default set of modules (if
      * {@link #mainJar(String) mainJar} is specified) are used.
      *
-     * @param modules one or more module
+     * @param modules one or more modules
      * @return this map of options
      */
     public JpackageOptions addModules(List<String> modules) {
@@ -51,7 +51,7 @@ public JpackageOptions addModules(List<String> modules) {
      * (if {@link #module(String, String) module} is specified), or the default set of modules (if
      * {@link #mainJar(String) mainJar} is specified) are used.
      *
-     * @param modules one or more module
+     * @param modules one or more modules
      * @return this map of options
      */
     public JpackageOptions addModules(String... modules) {
@@ -63,7 +63,7 @@ public JpackageOptions addModules(String... modules) {
      * <p>
      * <b>Requires Java 20 or higher</b>.
      *
-     * @param additionalContents one or more path
+     * @param additionalContents one or more paths
      * @return this map of options
      */
     public JpackageOptions appContent(List<String> additionalContents) {
@@ -76,7 +76,7 @@ public JpackageOptions appContent(List<String> additionalContents) {
      * <p>
      * <b>Requires Java 20 or higher</b>.
      *
-     * @param additionalContents one or more path
+     * @param additionalContents one or more paths
      * @return this map of options
      */
     public JpackageOptions appContent(String... additionalContents) {
@@ -129,7 +129,7 @@ public JpackageOptions appVersion(String version) {
     /**
      * Command line arguments to pass to main class if no command line arguments are given to the launcher.
      *
-     * @param arguments one or more argument
+     * @param arguments one or more arguments
      * @return this map of options
      */
     public JpackageOptions arguments(List<String> arguments) {
@@ -140,7 +140,7 @@ public JpackageOptions arguments(List<String> arguments) {
     /**
      * Command line arguments to pass to main class if no command line arguments are given to the launcher.
      *
-     * @param arguments one or more argument
+     * @param arguments one or more arguments
      * @return this map of options
      */
     public JpackageOptions arguments(String... arguments) {
@@ -619,7 +619,7 @@ public JpackageOptions macAppStore(boolean appStore) {
     /**
      * Include all the referenced content in the dmg.
      *
-     * @param additionalContents one or more path
+     * @param additionalContents one or more paths
      * @return this map of options
      */
     public JpackageOptions macDmgContent(String... additionalContents) {
@@ -629,7 +629,7 @@ public JpackageOptions macDmgContent(String... additionalContents) {
     /**
      * Include all the referenced content in the dmg.
      *
-     * @param additionalContents one or more path
+     * @param additionalContents one or more paths
      * @return this map of options
      */
     @SuppressWarnings("UnusedReturnValue")
@@ -641,7 +641,7 @@ public JpackageOptions macDmgContent(List<File> additionalContents) {
     /**
      * Include all the referenced content in the dmg.
      *
-     * @param additionalContents one or more path
+     * @param additionalContents one or more paths
      * @return this map of options
      */
     @SuppressWarnings("UnusedReturnValue")
@@ -652,7 +652,7 @@ public JpackageOptions macDmgContent(File... additionalContents) {
     /**
      * Include all the referenced content in the dmg.
      *
-     * @param additionalContents one or more path
+     * @param additionalContents one or more paths
      * @return this map of options
      */
     public JpackageOptions macDmgContentPaths(List<Path> additionalContents) {
@@ -664,7 +664,7 @@ public JpackageOptions macDmgContentPaths(List<Path> additionalContents) {
     /**
      * Include all the referenced content in the dmg.
      *
-     * @param additionalContents one or more path
+     * @param additionalContents one or more paths
      * @return this map of options
      */
     public JpackageOptions macDmgContentPaths(Path... additionalContents) {
@@ -674,7 +674,7 @@ public JpackageOptions macDmgContentPaths(Path... additionalContents) {
     /**
      * Include all the referenced content in the dmg.
      *
-     * @param additionalContents one or more path
+     * @param additionalContents one or more paths
      * @return this map of options
      */
     public JpackageOptions macDmgContentStrings(List<String> additionalContents) {
@@ -893,7 +893,7 @@ public JpackageOptions module(String name, String mainClass) {
      * <p>
      * Each path is absolute or relative to the current directory.
      *
-     * @param paths one or more path
+     * @param paths one or more paths
      * @return this map of options
      */
     public JpackageOptions modulePath(String... paths) {
@@ -907,7 +907,7 @@ public JpackageOptions modulePath(String... paths) {
      * <p>
      * Each path is absolute or relative to the current directory.
      *
-     * @param paths one or more path
+     * @param paths one or more paths
      * @return this map of options
      */
     public JpackageOptions modulePathStrings(List<String> paths) {
@@ -922,7 +922,7 @@ public JpackageOptions modulePathStrings(List<String> paths) {
      * <p>
      * Each path is absolute or relative to the current directory.
      *
-     * @param paths one or more path
+     * @param paths one or more paths
      * @return this map of options
      */
     @SuppressWarnings("UnusedReturnValue")
@@ -937,7 +937,7 @@ public JpackageOptions modulePath(File... paths) {
      * <p>
      * Each path is absolute or relative to the current directory.
      *
-     * @param paths one or more path
+     * @param paths one or more paths
      * @return this map of options
      */
     public JpackageOptions modulePath(List<File> paths) {
@@ -951,7 +951,7 @@ public JpackageOptions modulePath(List<File> paths) {
      * <p>
      * Each path is absolute or relative to the current directory.
      *
-     * @param paths one or more path
+     * @param paths one or more paths
      * @return this map of options
      */
     public JpackageOptions modulePath(Path... paths) {
@@ -965,7 +965,7 @@ public JpackageOptions modulePath(Path... paths) {
      * <p>
      * Each path is absolute or relative to the current directory.
      *
-     * @param paths one or more path
+     * @param paths one or more paths
      * @return this map of options
      */
     public JpackageOptions modulePathPaths(List<Path> paths) {