diff --git a/runs/fastqc/run.cwl b/runs/fastqc/run.cwl
index 974e99274b8fab4201a548c27fdda57f059544b4..b049a5f92ccca308657a8791af4c5d52f3871da3 100644
--- a/runs/fastqc/run.cwl
+++ b/runs/fastqc/run.cwl
@@ -16,9 +16,9 @@ steps:
     in:
       fastq: fastq
       finaloutdir: finaloutdir
-    out: [outdir]
+    out: [fastqc_outdir]
 
 outputs:
-  outdir:
+  fastqc_outdir:
     type: Directory
-    outputSource: fastqc/outdir
\ No newline at end of file
+    outputSource: fastqc/fastqc_outdir
\ No newline at end of file
diff --git a/workflows/fastqc/collectFilesInDir.cwl b/workflows/fastqc/collectFilesInDir.cwl
deleted file mode 100644
index 39f9ff8ae5a33d939136c081a9cd79533972eddc..0000000000000000000000000000000000000000
--- a/workflows/fastqc/collectFilesInDir.cwl
+++ /dev/null
@@ -1,20 +0,0 @@
-cwlVersion: v1.2
-class: ExpressionTool
-label: Collect files in a directory
-doc: |
-  Takes Files (e.g. from a workflow step) and yields them in a desired directory.
-requirements:
-  - class: InlineJavascriptRequirement
-inputs:
-  files: File[]
-  destination: string
-expression: |
-  ${
-    return {"outDir": {
-      "class": "Directory", 
-      "basename": inputs.destination,
-      "listing": inputs.files
-    } };
-  }
-outputs:
-  outDir: Directory
\ No newline at end of file
diff --git a/workflows/fastqc/fastqc.cwl b/workflows/fastqc/fastqc.cwl
index a2e408db732fa6913af001c6349dda4ac30a116e..f0b906a85f919f4547565b27a3254ad4404c8824 100644
--- a/workflows/fastqc/fastqc.cwl
+++ b/workflows/fastqc/fastqc.cwl
@@ -2,12 +2,14 @@
 cwlVersion: v1.2
 class: CommandLineTool
 
-label: Run fastqc on raw reads in FASTQ format (single or paired end) or aligned reads in BAM.
+label: FastQC - A high throughput sequence QC analysis tool
 
 doc: |
-  simplified from: https://github.com/common-workflow-library/bio-cwl-tools/blob/66f620da5b0a11e934a6da83272205a2516bcd91/fastqc/fastqc_1.cwl
-  
+  Original docs: https://www.bioinformatics.babraham.ac.uk/projects/fastqc/
+
   Run fastqc on raw reads in FASTQ format (single or paired end) or aligned reads in BAM.
+  
+  This CWL was adapted from: https://github.com/common-workflow-library/bio-cwl-tools/blob/66f620da5b0a11e934a6da83272205a2516bcd91/fastqc/fastqc_1.cwl
 
 hints:
   ResourceRequirement:
@@ -18,11 +20,13 @@ hints:
   SoftwareRequirement:
     packages:
       fastqc:
-        specs: [ https://identifiers.org/biotools/fastqc ]
+        specs: 
+          - https://identifiers.org/biotools/fastqc
+          - - https://identifiers.org/rrid/RRID:SCR_014583
         version: [ "0.11.9" ]
 
-
 baseCommand: "fastqc"
+
 arguments: 
   - valueFrom: $(runtime.outdir)
     prefix: "-o"
@@ -46,3 +50,13 @@ outputs:
     outputBinding:
       glob: "*_fastqc.html"
     
+
+$namespaces:
+  edam: https://edamontology.org/
+  s: https://schema.org/
+$schemas:
+  - https://edamontology.org/EDAM_1.18.owl
+
+s:license: https://spdx.org/licenses/GPL-3.0-or-later
+
+
diff --git a/workflows/fastqc/gather-files.cwl b/workflows/fastqc/gather-files.cwl
new file mode 100644
index 0000000000000000000000000000000000000000..67d23ec72e90012c4e07b2f2ebaf3b2d102308c8
--- /dev/null
+++ b/workflows/fastqc/gather-files.cwl
@@ -0,0 +1,24 @@
+cwlVersion: v1.2
+class: ExpressionTool
+label: Gather files
+doc: |
+  Helper tool to organize workflow outputs
+
+  Takes an array of files (e.g. from a workflow step) and yields them in a destination directory.
+
+  Adapted from: https://github.com/common-workflow-language/cwl-v1.1/blob/a22b7580c6b50e77c0a181ca59d3828dd5c69143/tests/dir7.cwl
+requirements:
+  - class: InlineJavascriptRequirement
+inputs:
+  inFiles: File[]
+  destination: string
+expression: |
+  ${
+    return {"outDir": {
+      "class": "Directory", 
+      "basename": inputs.destination,
+      "listing": inputs.inFiles
+    } };
+  }
+outputs:
+  outDir: Directory
\ No newline at end of file
diff --git a/workflows/fastqc/workflow.cwl b/workflows/fastqc/workflow.cwl
index d80a7eaafc7c6f530d3c43ca21716b005e7d1f4e..45923196e84b10785fbf079d4fe4c2d8397abfa4 100644
--- a/workflows/fastqc/workflow.cwl
+++ b/workflows/fastqc/workflow.cwl
@@ -18,15 +18,17 @@ steps:
       fastq: fastq
     out: [fastqc_zip, fastqc_html]
   collectFiles:
-    run: ./collectFilesInDir.cwl
+    run: ./gather-files.cwl
     in: 
-      destination: finaloutdir
-      files:
-        source: [fastqc/fastqc_html, fastqc/fastqc_zip]
+      inFiles:
+        source:
+          - fastqc/fastqc_html
+          - fastqc/fastqc_zip
         linkMerge: merge_flattened
+      destination: finaloutdir
     out: [outDir]
   
 outputs:
-  outdir:
+  fastqc_outdir:
     type: Directory
     outputSource: collectFiles/outDir
\ No newline at end of file
diff --git a/workflows/kallisto/gather-dirs.cwl b/workflows/kallisto/gather-dirs.cwl
index a11ef77318f071f07e21b0e65ce4a0cf96918ead..858682309d3ce7fef50d7d71741832f9ecdde0ae 100644
--- a/workflows/kallisto/gather-dirs.cwl
+++ b/workflows/kallisto/gather-dirs.cwl
@@ -2,8 +2,8 @@ cwlVersion: v1.2
 class: ExpressionTool
 label: Gather directories
 doc: |
-  Helper tool to organize 
-
+  Helper tool to organize workflow outputs
+  
   Takes an array of directories (e.g. from a workflow step) and yields them in a destination directory.
 
   Adapted from: https://github.com/common-workflow-language/cwl-v1.1/blob/a22b7580c6b50e77c0a181ca59d3828dd5c69143/tests/dir7.cwl
diff --git a/workflows/kallisto/kallisto-index.cwl b/workflows/kallisto/kallisto-index.cwl
index e374a1f5ad55c0706f488236e258fac7c1c6cdd9..b43cba7adfe32a26892de9acff2d747d20c4e28f 100644
--- a/workflows/kallisto/kallisto-index.cwl
+++ b/workflows/kallisto/kallisto-index.cwl
@@ -26,6 +26,8 @@ doc: |
   -m, --min-size=INT          Length of minimizers (default: automatically chosen)
   -e, --ec-max-size=INT       Maximum number of targets in an equivalence class (default: no maximum)
 
+  This CWL was adapted from: https://github.com/common-workflow-library/bio-cwl-tools/commit/91c42fb809ce18eafe16155cca0abf362270c0fe
+
 hints:
   DockerRequirement:
     dockerPull: quay.io/biocontainers/kallisto:0.51.1--ha4fb952_1
diff --git a/workflows/kallisto/kallisto-quant.cwl b/workflows/kallisto/kallisto-quant.cwl
index 8da7542a585fc7a50e436045a568cd820426b381..998c371f230cec6cabb4ea1f194b88510205fa0c 100755
--- a/workflows/kallisto/kallisto-quant.cwl
+++ b/workflows/kallisto/kallisto-quant.cwl
@@ -37,6 +37,9 @@ doc: |
       --verbose                 Print out progress information every 1M proccessed reads
 
 
+  This CWL was adapted from: https://github.com/common-workflow-library/bio-cwl-tools/commit/91c42fb809ce18eafe16155cca0abf362270c0fe
+
+
 hints:
   DockerRequirement:
     dockerPull: quay.io/biocontainers/kallisto:0.51.1--ha4fb952_1