diff --git a/README.md b/README.md
index dfbb92f28578696e1e83c0effe3a2e19df52375d..1c073710c35a3a7ae23bbaec76aef3707fa1397c 100644
--- a/README.md
+++ b/README.md
@@ -163,7 +163,7 @@ export PATH=${JAVA_HOME}/bin:$PATH
 
 ### Launcher Script
 
-One downside to manual jar downloads is that you don't keep up-to-date with the latest released version. We have a Bash launcher script at [bin/utils/openapi-generator.cli.sh](./bin/utils/openapi-generator.cli.sh) which resolves this issue.
+One downside to manual jar downloads is that you don't keep up-to-date with the latest released version. We have a Bash launcher script at [bin/utils/openapi-generator.cli.sh](./bin/utils/openapi-generator-cli.sh) which resolves this issue.
 
 To install the launcher script, copy the contents of the script to a location on your path and make the script executable.
 
diff --git a/modules/openapi-generator-gradle-plugin/README.adoc b/modules/openapi-generator-gradle-plugin/README.adoc
index 4090a03e88af787ede55e7985a14a65a82fd6f36..cdf612788b8b73e4e62abd9740fcdb9ba4839316 100644
--- a/modules/openapi-generator-gradle-plugin/README.adoc
+++ b/modules/openapi-generator-gradle-plugin/README.adoc
@@ -475,7 +475,7 @@ $ ./gradlew openApiValidate --input=/Users/jim/projects/openapi-generator/module
 If you want to perform multiple generation tasks, you'd want to create a task that inherits from the `GenerateTask`.
 Examples can be found in https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle[samples/local-spec/build.gradle].
 
-To match the example you are using for that old swagger based plugin:
+You can define any number of generator tasks; the generated code does _not_ need to be a JVM language.
 
 ```gradle
 task buildGoClient(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask){
@@ -517,8 +517,8 @@ If you want to simplify the execution, you could create a new task with `depends
 task codegen(dependsOn: ['buildGoClient', 'buildKotlinClient'])
 ```
 
-Or, if you're generating the code on compile, you can add these as a dependency to `compileJava` or any other existing task:
-
+Or, if you're generating the code on compile, you can add these as a dependency to `compileJava` or any other existing task.
+You can also mix the default task `openApiGenerate` with custom tasks:
 
 ```gradle
 compileJava.dependsOn buildKotlinClient, tasks.openApiGenerate