diff --git a/TODO.md b/TODO.md
index 43a9c5a..b35da98 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,4 +1,4 @@
-- signature extraction/removal/verificaton on MSI/CAB files
+- signature extraction/removal/verification on MSI/CAB files
 - clean up / untangle code
 - separate timestamping
 - remove mmap usage to increase portability
diff --git a/appx.c b/appx.c
index 56aef7d..41f8fce 100644
--- a/appx.c
+++ b/appx.c
@@ -925,7 +925,7 @@ static int appx_write_central_directory(BIO *bio, ZIP_FILE *zip, int removeSigna
         if (removeSignature && !strcmp(entry->fileName, APP_SIGNATURE_FILENAME)) {
             continue;
         }
-        /* APP_SIGNATURE is nt 'tainted' by offset shift after replacing the contents of [content_types] */
+        /* APP_SIGNATURE is not 'tainted' by offset shift after replacing the contents of [content_types] */
         zipWriteCentralDirectoryEntry(bio, &sizeOnDisk, entry, strcmp(entry->fileName, APP_SIGNATURE_FILENAME) ? offsetDiff : 0);
         cdSize += sizeOnDisk;
         if (entry->overrideData) {
@@ -1430,7 +1430,7 @@ static void zipWriteCentralDirectoryEntry(BIO *bio, uint64_t *sizeOnDisk, ZIP_CE
 #if 0
     if (entry->extraFieldLen > 0 && entry->extraField)
     {
-        /* TODO, if override daata, need to rewrite the extra field */
+        /* TODO, if override data, need to rewrite the extra field */
         BIO_write(bio, entry->extraField, entry->extraFieldLen);
     }
 #endif
diff --git a/osslsigncode.c b/osslsigncode.c
index 18152d8..a61d96e 100644
--- a/osslsigncode.c
+++ b/osslsigncode.c
@@ -998,7 +998,7 @@ static BIO *bio_get_http(char *url, BIO *req, char *proxy, int rfc3161, char *ca
 #endif /* OPENSSL_VERSION_NUMBER<0x30000000L */
 
 /*
- * Decode a HTTP response from BIO and write it into the PKCS7 structure
+ * Decode an HTTP response from BIO and write it into the PKCS7 structure
  * Add timestamp to the PKCS7 SignerInfo structure:
  * sig->d.sign->signer_info->unauth_attr
  * [in, out] p7: new PKCS#7 signature
diff --git a/tests/client_http.py b/tests/client_http.py
index b7618f8..147b8e5 100644
--- a/tests/client_http.py
+++ b/tests/client_http.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python3
-"""Implementation of a HTTP client"""
+"""Implementation of an HTTP client"""
 
 import os
 import sys
diff --git a/tests/exec.py b/tests/exec.py
index 0aa9171..87fa2c6 100644
--- a/tests/exec.py
+++ b/tests/exec.py
@@ -29,7 +29,7 @@ def main() -> None:
             # all exceptions are critical
             print(err, file=sys.stderr)
     else:
-        print("Usage:\n\t{} COMMAND [ARG]...'".format(sys.argv[0]), file=sys.stderr)
+        print("Usage:\n\t{} COMMAND [ARG]...".format(sys.argv[0]), file=sys.stderr)
     sys.exit(1)
 
 
diff --git a/tests/server_http.py b/tests/server_http.py
index 629494c..591945a 100644
--- a/tests/server_http.py
+++ b/tests/server_http.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python3
-"""Implementation of a HTTP server"""
+"""Implementation of an HTTP server"""
 
 import argparse
 import os
diff --git a/tests/server_http.pyw b/tests/server_http.pyw
index d955465..b97462a 100644
--- a/tests/server_http.pyw
+++ b/tests/server_http.pyw
@@ -1,5 +1,5 @@
 #!/usr/bin/python3
-"""Windows: Implementation of a HTTP server"""
+"""Windows: Implementation of an HTTP server"""
 
 import argparse
 import os
diff --git a/tests/start_server.py b/tests/start_server.py
index b2554ab..1751b2e 100644
--- a/tests/start_server.py
+++ b/tests/start_server.py
@@ -51,7 +51,7 @@ def clear_catalog(certs_path) -> None:
         file.write(random_hex)
 
 def main() -> None:
-    """Wait for all tests certificate, compute leafhash"""
+    """Wait for all test certificates and compute leaf hash"""
 
     parser = argparse.ArgumentParser()
     parser.add_argument(