diff --git a/Dockerfile b/Dockerfile
index 9c67645..d87ca22 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,31 +4,36 @@ ARG HEATCLUSTER_VER="0.4.12"
 
 LABEL base.image="ubuntu:jammy"
 LABEL dockerfile.version="1"
+LABEL software="HeatCluster"
 LABEL software.version="${HEATCLUSTER_VER}"
-LABEL version="${HEATCLUSTER_VER}"
+LABEL description="This software produces a heatmap for a SNP matrix"
 LABEL website="https://github.com/DrB-S/HeatCluster"
 LABEL license="https://github.com/DrB-S/HeatCluster/blob/master/LICENSE"
 LABEL name="heatcluster/${HEATCLUSTER_VER}"
+LABEL maintainer="Stephen Beckstrom-Sternberg"
+LABEL maintainer.email="stephen.beckstrom-sternberg@azdhs.gov"
 
+# 'RUN' executes code during the build
 # Install Python and pip
 RUN apt-get update && apt-get install -y python3 python3-pip && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Install Python packages
+# Install Python dependencies
 RUN pip3 install pandas numpy pathlib seaborn matplotlib scipy 
 
 # Make /data the working dir
 RUN mkdir /data
-WORKDIR /HeatCluster
+WORKDIR /data
 
 COPY . .
 
+# 'ENV' instructions set environment variables that persist from the build into the resulting image
+# Use for e.g. $PATH and locale settings for compatibility with Singularity
 ENV PATH="/HeatCluster-${HEATCLUSTER_VER}/bin:$PATH" \
  LC_ALL=C
- 
-CMD HeatCluster.py --help
 
-WORKDIR /data
+# 'CMD' instructions set a default command when the container is run.  
+CMD HeatCluster.py --help
 
 FROM app as test
 
@@ -44,4 +49,4 @@ RUN heatcluster --help && \
 # Demonstrate that the program is successfully installed
 
 # Run the program's internal tests if available
-RUN Heatcluster.py --test
+RUN HeatCluster.py --test