diff --git a/validator/cpp/engine/embed_data.bzl b/validator/cpp/engine/embed_data.bzl
index ff9ee299a9d9..ba0f40fd9867 100644
--- a/validator/cpp/engine/embed_data.bzl
+++ b/validator/cpp/engine/embed_data.bzl
@@ -39,7 +39,7 @@ embed_data = rule(
         ),
         "header_generator": attr.label(
             executable = True,
-            cfg = "host",
+            cfg = "exec",
             allow_files = True,
             default = Label(
                 "//cpp/engine/scripts:filecontents_to_cpp_header",
diff --git a/validator/cpp/engine/parse-layout-sizes.h b/validator/cpp/engine/parse-layout-sizes.h
index 130e20ca8654..2150cf858e03 100644
--- a/validator/cpp/engine/parse-layout-sizes.h
+++ b/validator/cpp/engine/parse-layout-sizes.h
@@ -9,7 +9,7 @@ namespace amp::validator::parse_layout_sizes {
 
 // WARNING: This code is still in development and not ready to be used.
 
-// This is a single representation for the CssSizes object.
+// This is a single represenation for the CssSizes object.
 // It consists of at least a valid size and a possible media condition.
 // See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#Attributes
 struct CssSize {
diff --git a/validator/cpp/engine/parse-srcset_test.cc b/validator/cpp/engine/parse-srcset_test.cc
index 97bf3435e9ab..894ae8bf7db8 100644
--- a/validator/cpp/engine/parse-srcset_test.cc
+++ b/validator/cpp/engine/parse-srcset_test.cc
@@ -150,7 +150,7 @@ TEST(ParseSrcsetTest, LeadingAndTrailingCommasAndCommasInUrl) {
               EqCandidates({{"example.com/,/,/,/,50w", "1x"}}));
 }
 
-TEST(ParseSrcsetTest, NoWhitespace) {
+TEST(ParseSrcsetTest, NoWhitepsace) {
   SrcsetParsingResult result = ParseSourceSet("image 100w,image 50w");
   EXPECT_TRUE(result.success);
   EXPECT_THAT(result.srcset_images,
diff --git a/validator/cpp/engine/testing-utils.cc b/validator/cpp/engine/testing-utils.cc
index b6e115d30963..f6cc635024dc 100644
--- a/validator/cpp/engine/testing-utils.cc
+++ b/validator/cpp/engine/testing-utils.cc
@@ -97,8 +97,6 @@ const std::map<std::string, TestCase>& TestCases() {
            "external/amphtml-extensions/*/*/test/*.html",
             &html_files)) << "Test cases file pattern not found.";
 
-    CHECK(!html_files.empty()) << "Validator test cases are empty. Will not proceed.";
-    
     std::sort(html_files.begin(), html_files.end());
     for (const std::string& html_file : html_files) {
       if (html_file.find("/js_only/") != std::string::npos) continue;
diff --git a/validator/cpp/engine/utf8-util_test.cc b/validator/cpp/engine/utf8-util_test.cc
index a2a2472a646c..0f5f6b9bf783 100644
--- a/validator/cpp/engine/utf8-util_test.cc
+++ b/validator/cpp/engine/utf8-util_test.cc
@@ -14,7 +14,7 @@ TEST(Utf8UtilTest, Utf16StrLen) {
   // It's 34 bytes long and 22 utf-8 characters long. Javascript uses UTF16
   // strings and string lengths.
   // The chars in Iñtërnâtiônàlizætiøn vary between 1 and 2 byte lengths, all
-  // javascript 1-char lengths. The ⚡ is a 3-byte length character, with a
+  // javascript 1-char lenghts. The ⚡ is a 3-byte length character, with a
   // 1-char javascript length. Finally the 💩 is a 4-byte length character with
   // a 2-char javascript length.
   EXPECT_EQ(Utf16StrLen("Iñtërnâtiônàlizætiøn☃💩"), 23);
diff --git a/validator/cpp/engine/validator-internal.cc b/validator/cpp/engine/validator-internal.cc
index fd62ee99e249..c230e7c6af02 100644
--- a/validator/cpp/engine/validator-internal.cc
+++ b/validator/cpp/engine/validator-internal.cc
@@ -311,62 +311,42 @@ ScriptTag ParseScriptTag(htmlparser::Node* node) {
     }
   }
 
-  if (src.empty()) {
-    return script_tag;
-  }
-
-  std::string src_str{src};
   // Determine if this has a valid AMP domain and separate the path from the
   // attribute 'src'. Consumes the domain making src just the path.
   if (absl::ConsumePrefix(&src, kAmpProjectDomain)) {
     script_tag.is_amp_domain = true;
-    script_tag.path = src_str;
-  } else {
-    script_tag.is_amp_domain = false;
-    htmlparser::URL url(src_str);
-    // Error cases, early exit:
-    if (!url.is_valid()) return script_tag;
-    if (!url.has_protocol()) return script_tag;
-    if (url.protocol() != "https" && url.protocol() != "http")
-      return script_tag;
-    if (url.hostname().empty()) return script_tag;
-
-    src = url.path_params_fragment().data();
-    // Trim the "/" prefix as this is what kExtensionPathRe expects.
-    if (!src.empty() && src[0] == '/') src = src.substr(1);
-    std::string src_str{src};
-    script_tag.path = src_str;
-  }
-
-  // Only look at script tags that have attribute 'async'.
-  if (has_async_attr) {
-    // Determine if this is the AMP Runtime.
-    if (!script_tag.is_extension &&
-        RE2::FullMatch(src, *kRuntimeScriptPathRe)) {
-      script_tag.is_runtime = true;
-      script_tag.has_valid_path = true;
-    }
-
-    // For AMP Extensions, validate path and extract name and version.
-    if (script_tag.is_extension &&
-        RE2::FullMatch(src, *kExtensionPathRe, &script_tag.extension_name,
-                       &script_tag.extension_version)) {
-      script_tag.has_valid_path = true;
-    }
-
-    // Determine the release version (LTS, module, standard, etc).
-    if ((has_module_attr && RE2::FullMatch(src, *kModuleLtsScriptPathRe)) ||
-        (has_nomodule_attr && RE2::FullMatch(src, *kLtsScriptPathRe))) {
-      script_tag.release_version = ScriptReleaseVersion::MODULE_NOMODULE_LTS;
-    } else if ((has_module_attr &&
-                RE2::FullMatch(src, *kModuleScriptPathRe)) ||
-               (has_nomodule_attr &&
-                RE2::FullMatch(src, *kStandardScriptPathRe))) {
-      script_tag.release_version = ScriptReleaseVersion::MODULE_NOMODULE;
-    } else if (RE2::FullMatch(src, *kLtsScriptPathRe)) {
-      script_tag.release_version = ScriptReleaseVersion::LTS;
-    } else if (RE2::FullMatch(src, *kStandardScriptPathRe)) {
-      script_tag.release_version = ScriptReleaseVersion::STANDARD;
+    script_tag.path = std::string(src);
+
+    // Only look at script tags that have attribute 'async'.
+    if (has_async_attr) {
+      // Determine if this is the AMP Runtime.
+      if (!script_tag.is_extension &&
+          RE2::FullMatch(src, *kRuntimeScriptPathRe)) {
+        script_tag.is_runtime = true;
+        script_tag.has_valid_path = true;
+      }
+
+      // For AMP Extensions, validate path and extract name and version.
+      if (script_tag.is_extension &&
+          RE2::FullMatch(src, *kExtensionPathRe, &script_tag.extension_name,
+                         &script_tag.extension_version)) {
+        script_tag.has_valid_path = true;
+      }
+
+      // Determine the release version (LTS, module, standard, etc).
+      if ((has_module_attr && RE2::FullMatch(src, *kModuleLtsScriptPathRe)) ||
+          (has_nomodule_attr && RE2::FullMatch(src, *kLtsScriptPathRe))) {
+        script_tag.release_version = ScriptReleaseVersion::MODULE_NOMODULE_LTS;
+      } else if ((has_module_attr &&
+                  RE2::FullMatch(src, *kModuleScriptPathRe)) ||
+                 (has_nomodule_attr &&
+                  RE2::FullMatch(src, *kStandardScriptPathRe))) {
+        script_tag.release_version = ScriptReleaseVersion::MODULE_NOMODULE;
+      } else if (RE2::FullMatch(src, *kLtsScriptPathRe)) {
+        script_tag.release_version = ScriptReleaseVersion::LTS;
+      } else if (RE2::FullMatch(src, *kStandardScriptPathRe)) {
+        script_tag.release_version = ScriptReleaseVersion::STANDARD;
+      }
     }
   }
   return script_tag;
@@ -1192,7 +1172,7 @@ class ParsedTagSpec {
 
   // Whether or not the tag should be recorded via
   // Context->RecordTagspecValidated if it was validated
-  // successfully. For performance, this is only done for tags that
+  // successfullly. For performance, this is only done for tags that
   // are mandatory, unique, or possibly required by some other tag.
   RecordValidated ShouldRecordTagspecValidated() const {
     return should_record_tagspec_validated_;
@@ -1284,7 +1264,7 @@ std::string TagSpecUrl(const TagSpec& spec) {
     return StrCat(extension_spec_url_prefix, spec.extension_spec().name());
   if (spec.requires_extension_size() > 0)
     // Return the first |requires_extension|, which should be the most
-    // representative.
+    // representitive.
     return StrCat(extension_spec_url_prefix, spec.requires_extension(0));
 
   return "";
@@ -2834,11 +2814,11 @@ class InvalidRuleVisitor : public htmlparser::css::RuleVisitor {
 class InvalidDeclVisitor : public htmlparser::css::RuleVisitor {
  public:
   InvalidDeclVisitor(const ParsedDocCssSpec& css_spec, Context* context,
-                     const std::string& tag_descriptive_name,
+                     const std::string& tag_decriptive_name,
                      ValidationResult* result)
       : css_spec_(css_spec),
         context_(context),
-        tag_descriptive_name_(tag_descriptive_name),
+        tag_descriptive_name_(tag_decriptive_name),
         result_(result) {}
 
   void VisitDeclaration(
@@ -3996,14 +3976,8 @@ void ValidateAmpScriptSrcAttr(const ParsedHtmlTag& tag,
                               const TagSpec& tag_spec, const Context& context,
                               ValidationResult* result) {
   if (!tag.IsAmpDomain()) {
-    bool is_amp_format =
-        c_find(context.type_identifiers(), TypeIdentifier::kAmp) !=
-        context.type_identifiers().end();
-    if (!is_amp_format || context.is_transformed()) {
-      context.AddError(ValidationError::DISALLOWED_AMP_DOMAIN,
-                       context.line_col(),
-                       /*params=*/{}, /*spec_url=*/"", result);
-    }
+    context.AddError(ValidationError::DISALLOWED_AMP_DOMAIN, context.line_col(),
+                     /*params=*/{}, /*spec_url=*/"", result);
   }
 
   if (tag.IsExtensionScript() && tag_spec.has_extension_spec()) {
@@ -5686,7 +5660,9 @@ class ParsedValidatorRulesProvider {
 class Validator {
  public:
   Validator(const ParsedValidatorRules* rules, int max_errors = -1)
-      : rules_(rules), max_errors_(max_errors), context_(rules_, max_errors_) {}
+      : rules_(rules),
+        max_errors_(max_errors),
+        context_(rules_, max_errors_) {}
 
   ValidationResult Validate(const htmlparser::Document& doc) {
     doc_metadata_ = doc.Metadata();
diff --git a/validator/cpp/engine/validator_test.cc b/validator/cpp/engine/validator_test.cc
index a4421cf7f84d..bbd5394e239e 100644
--- a/validator/cpp/engine/validator_test.cc
+++ b/validator/cpp/engine/validator_test.cc
@@ -481,8 +481,8 @@ TEST(ValidatorTest, TestCssLengthAmpEmail) {
         ":13:2 The author stylesheet specified in tag 'style amp-custom' "
         "is too long - document contains 75001 bytes whereas the "
         "limit is 75000 "
-        "bytes. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/"
-        "spec/amphtml#maximum-size)");
+        "bytes. (see https://amp.dev/documentation/guides-and-tutorials/learn/"
+        "spec/amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -527,7 +527,7 @@ TEST(ValidatorTest, TestCssLengthAmpEmail) {
         ":19:6 The author stylesheet specified in tag 'style amp-custom' "
         "and the combined inline styles is too large - document contains 75010 "
         "bytes whereas the limit is 75000 bytes. (see https://amp.dev/"
-        "documentation/guides-and-tutorials/email/learn/spec/amphtml#maximum-size)");
+        "documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -555,7 +555,7 @@ TEST(ValidatorTest, TestCssLengthAmpEmail) {
         ":7519:6 The author stylesheet specified in tag 'style amp-custom' "
         "and the combined inline styles is too large - document contains 75014 "
         "bytes whereas the limit is 75000 bytes. (see https://amp.dev/"
-        "documentation/guides-and-tutorials/email/learn/spec/amphtml#maximum-size)");
+        "documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -601,8 +601,8 @@ TEST(ValidatorTest, TestCssLengthAmpEmail) {
         test_case_name,
         ":17:2 The inline style specified in tag 'div' is too long - it "
         "contains 1001 bytes whereas the limit is 1000 bytes. (see "
-        "https://amp.dev/documentation/guides-and-tutorials/email/learn/spec/"
-        "amphtml#maximum-size)");
+        "https://amp.dev/documentation/guides-and-tutorials/learn/spec/"
+        "amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 }
@@ -649,8 +649,8 @@ TEST(ValidatorTest, TestCssLengthAmpEmailStrict) {
         ":13:2 The author stylesheet specified in tag 'style amp-custom' "
         "is too long - document contains 75001 bytes whereas the "
         "limit is 75000 "
-        "bytes. (see https://amp.dev/documentation/guides-and-tutorials/email/learn/"
-        "spec/amphtml#maximum-size)");
+        "bytes. (see https://amp.dev/documentation/guides-and-tutorials/learn/"
+        "spec/amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -681,7 +681,7 @@ TEST(ValidatorTest, TestCssLengthAmpEmailStrict) {
         ":19:6 The author stylesheet specified in tag 'style amp-custom' "
         "and the combined inline styles is too large - document contains 75010 "
         "bytes whereas the limit is 75000 bytes. (see https://amp.dev/"
-        "documentation/guides-and-tutorials/email/learn/spec/amphtml#maximum-size)");
+        "documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -701,7 +701,7 @@ TEST(ValidatorTest, TestCssLengthAmpEmailStrict) {
         ":3769:6 The author stylesheet specified in tag 'style amp-custom' "
         "and the combined inline styles is too large - document contains 75014 "
         "bytes whereas the limit is 75000 bytes. (see https://amp.dev/"
-        "documentation/guides-and-tutorials/email/learn/spec/amphtml#maximum-size)");
+        "documentation/guides-and-tutorials/learn/spec/amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 
@@ -734,8 +734,8 @@ TEST(ValidatorTest, TestCssLengthAmpEmailStrict) {
         StrCat("FAIL\n", test_case_name,
                ":17:2 The inline style specified in tag 'div' is too long - it "
                "contains 1001 bytes whereas the limit is 1000 bytes. (see "
-               "https://amp.dev/documentation/guides-and-tutorials/email/learn/spec/"
-               "amphtml#maximum-size)");
+               "https://amp.dev/documentation/guides-and-tutorials/learn/spec/"
+               "amphtml/#maximum-size)");
     EXPECT_EQ(expected_output, output) << "test case " << test_case_name;
   }
 }
diff --git a/validator/cpp/engine/wasm/BUILD b/validator/cpp/engine/wasm/BUILD
index e6ddc86cc49f..4253cb6e5a2d 100644
--- a/validator/cpp/engine/wasm/BUILD
+++ b/validator/cpp/engine/wasm/BUILD
@@ -1,7 +1,6 @@
 # Wraps AMP Validator into a WebAssembly library,
 # which can be used by javascript files.
 
-load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@emsdk//emscripten_toolchain:wasm_rules.bzl", "wasm_cc_binary")
 load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_binary", "closure_js_library")
 
@@ -73,8 +72,3 @@ closure_js_binary(
         ":validator_js_lib",
     ],
 )
-
-build_test(
-    name = "validator_js_test",
-    targets = [":validator_js_bin"],
-)
diff --git a/validator/cpp/engine/wasm/validator.js b/validator/cpp/engine/wasm/validator.js
index e4008ede60ad..5014482505fa 100644
--- a/validator/cpp/engine/wasm/validator.js
+++ b/validator/cpp/engine/wasm/validator.js
@@ -83,7 +83,7 @@ function digitizeValidationErrorFields(error) {
 /**
  * When transforming validation errors and validation results from jspb to plain
  * objects, the protobuf base64 string is also attached to the output.
- * Hence when a plain object needs to be transformed back to protobuf,
+ * Hence when a plain object neeeds to be transformed back to protobuf,
  * the attached base64 could be directly used.
  */
 const PB_BASE64 = '_PB_BASE64';
diff --git a/validator/cpp/htmlparser/BUILD b/validator/cpp/htmlparser/BUILD
index 3d31520f96a2..78de2920159d 100644
--- a/validator/cpp/htmlparser/BUILD
+++ b/validator/cpp/htmlparser/BUILD
@@ -71,7 +71,7 @@ cc_test(
 )
 
 # Similar to go lang's defer statement. Defers the execution of statement
-# until in which it is declared goes out of scope.
+# until in which it is decalred goes out of scope.
 cc_library(
     name = "defer",
     hdrs = [
@@ -80,7 +80,7 @@ cc_library(
     copts = ["-std=c++17"],
 )
 
-# Helper library declares various doctype constants and a utility function to
+# Helper library decalres various doctype constants and a utility function to
 # parse doctype string and extract various components in it.
 cc_library(
     name = "doctype",
diff --git a/validator/cpp/htmlparser/allocator.h b/validator/cpp/htmlparser/allocator.h
index 09e9d4b9dd50..0620c4ed32fb 100644
--- a/validator/cpp/htmlparser/allocator.h
+++ b/validator/cpp/htmlparser/allocator.h
@@ -62,7 +62,7 @@
 // is naturally aligned if the address used to identify it has an 8-byte
 // alignment.
 //
-// Following data structure contains members totaling 13 bytes, but it's actual
+// Following data struture contains members totaling 13 bytes, but it's actual
 // size is 24 bytes due to 8 byte alignment.
 //
 // Alignment is always equal to the largest sized element in the structure.
@@ -201,10 +201,10 @@ class Allocator {
   Allocator& operator=(const Allocator&) = delete;
 
   // Allocates memory of same size required to construct object of type T.
-  // Returns nullptr if allocation failed.
+  // Returns nullptr if alloction failed.
   void* Allocate() {
     // Checks if remaining bytes in block are less than object size, or
-    // remaining bytes after alignment is less than object size.
+    // reamining bytes after alignment is less than object size.
     // Add a new block.
     if (object_size_ > remaining_ || !AlignFreeAddress()) {
       if (!NewBlock()) return nullptr;
@@ -338,7 +338,7 @@ class Allocator {
   }
 
   // If the block's address is not aligned, moves the pointer to the address
-  // that is multiple of alignment_.
+  // that is multiple of aligment_.
   bool AlignFreeAddress() {
     // Checks how many bytes to skip to be at the correct alignment.
     if (const std::size_t skip =
diff --git a/validator/cpp/htmlparser/css/parse-css-urls.cc b/validator/cpp/htmlparser/css/parse-css-urls.cc
index 75ce200899ae..9d2ae3d3033d 100644
--- a/validator/cpp/htmlparser/css/parse-css-urls.cc
+++ b/validator/cpp/htmlparser/css/parse-css-urls.cc
@@ -47,7 +47,7 @@ void Preprocess(vector<char32_t>* codepoints) {
         out.push_back('\n');
         last_codepoint_was_cr = true;
         break;
-      case '\f':  // also known as form feed (FF)
+      case '\f':  // also knwon as form feed (FF)
         out.push_back('\n');
         last_codepoint_was_cr = false;
         break;
diff --git a/validator/cpp/htmlparser/css/parse-css.cc b/validator/cpp/htmlparser/css/parse-css.cc
index 7e0b4aa9ab26..4df12b588e33 100644
--- a/validator/cpp/htmlparser/css/parse-css.cc
+++ b/validator/cpp/htmlparser/css/parse-css.cc
@@ -85,7 +85,7 @@ const std::string& Token::StringValue() const {
 }
 
 std::string Token::ToString() const {
-  // The following are overridden in their class: AT_KEYWORD, CLOSE_CURLY,
+  // The following are overriden in their class: AT_KEYWORD, CLOSE_CURLY,
   // CLOSE_PAREN, CLOSE_SQUARE, DELIM, DIMENSION, FUNCTION_TOKEN, IDENT,
   // NUMBER, OPEN_CURLY, OPEN_PAREN, OPEN_SQUARE, PERCENTAGE, STRING, URL
   switch (Type()) {
@@ -343,7 +343,7 @@ bool Whitespace(char32_t code) {
 char32_t kMaximumallowedcodepoint = 0x10ffff;
 
 // A MarkedPosition object saves position information from the tokenizer
-// provided as |line| and |col| to the constructor and can later write that
+// rovided as |line| and |col| to the constructor and can later write that
 // position back to a Token object.
 class MarkedPosition {
  public:
@@ -2471,7 +2471,7 @@ CombinatorType::Code CombinatorTypeForToken(const Token& token) {
   if (IsDelim(token, "+")) return CombinatorType::ADJACENT_SIBLING;
   if (IsDelim(token, "~")) return CombinatorType::GENERAL_SIBLING;
   // CombinatorTypeForToken is only ever called if the token has one of these
-  // delimiters, so reaching this point is impossible.
+  // delimitors, so reaching this point is impossible.
   CHECK(false) << absl::StrCat(
       "not a combinator token - type=", TokenType::Code_Name(token.Type()),
       " value=", token.StringValue());
diff --git a/validator/cpp/htmlparser/css/parse-css.h b/validator/cpp/htmlparser/css/parse-css.h
index 2f802e214558..d1612a0c4258 100644
--- a/validator/cpp/htmlparser/css/parse-css.h
+++ b/validator/cpp/htmlparser/css/parse-css.h
@@ -741,7 +741,7 @@ class Selector : public Token {
   virtual void Accept(SelectorVisitor* visitor) const = 0;
 };
 
-// This node models type selectors and universal selectors.
+// This node models type selectors and universial selectors.
 // http://www.w3.org/TR/css3-selectors/#type-selectors
 // http://www.w3.org/TR/css3-selectors/#universal-selector
 class TypeSelector : public Selector {
diff --git a/validator/cpp/htmlparser/data/amptags.txt b/validator/cpp/htmlparser/data/amptags.txt
index b5ac9625fa0f..032b0b90ad9f 100644
--- a/validator/cpp/htmlparser/data/amptags.txt
+++ b/validator/cpp/htmlparser/data/amptags.txt
@@ -93,7 +93,6 @@ amp-script
 amp-selector
 amp-sidebar
 amp-skimlinks
-amp-slikeplayer
 amp-smartlinks
 amp-social-share
 amp-soundcloud
diff --git a/validator/cpp/htmlparser/data/jsongrammar.txt b/validator/cpp/htmlparser/data/jsongrammar.txt
index db0cd32d8291..d79b3eb8cd4e 100644
--- a/validator/cpp/htmlparser/data/jsongrammar.txt
+++ b/validator/cpp/htmlparser/data/jsongrammar.txt
@@ -128,7 +128,7 @@ DICT_KEY_BEGIN_QUOTE "\t\n\r " DICT_KEY_BEGIN_QUOTE;
 DICT "\t\n\r " DICT;
 DICT '}' POP DICT_END;
 DICT_KEY ':' DICT_VALUE DICT_KEY_END;
-# Ignore whitespace between key and colon.
+# Ignore whitespace betwen key and colon.
 DICT_KEY "\t\n\r " DICT_KEY;
 DICT_VALUE '"' STRING|PUSH|DICT_END_OR_SEPARATOR STRING_T;
 DICT_VALUE 't' TRUE_1|PUSH|DICT_END_OR_SEPARATOR TRUE_T;
diff --git a/validator/cpp/htmlparser/fileutil.cc b/validator/cpp/htmlparser/fileutil.cc
index a59ca2aa3cb2..58b5834bf9b1 100644
--- a/validator/cpp/htmlparser/fileutil.cc
+++ b/validator/cpp/htmlparser/fileutil.cc
@@ -18,7 +18,7 @@
 // effects is minimized because this is a cc file not an h file. In fact, the
 // WebAssembly module never calls the glob function, so it is better to split
 // fileutil.cc into two files, and the WebAssembly module will only depend on
-// the one without glob functions.
+// the one without glob funcitons.
 #ifndef GLOB_TILDE
 #define GLOB_TILDE (1 << 12)
 #endif
diff --git a/validator/cpp/htmlparser/grammar/tablebuilder.h b/validator/cpp/htmlparser/grammar/tablebuilder.h
index 4052ac78f263..f62e22f95007 100644
--- a/validator/cpp/htmlparser/grammar/tablebuilder.h
+++ b/validator/cpp/htmlparser/grammar/tablebuilder.h
@@ -7,7 +7,7 @@
 // class must be thoroughly tested.
 //
 // Builds a state table by reading grammar file that contains rules for parsing
-// a basic (limited), context free, unambiguous grammar.
+// a basic (limited), context free, unambigous grammar.
 //
 // Using TableBuilder one can generate parser states by writing rules in a
 // text file. See htmlparser/data/jsongrammar.txt.
@@ -15,7 +15,7 @@
 // Grammar text file contains rules which lists states and its transition
 // from one state to another as parser reads input characters. The parse
 // table is pushdown automation that uses stack to push and pop parsing
-// states. Unlike LR parsers there is no shift at each stage of parsing.
+// states. Unline LR parsers there is no shift at each stage of parsing.
 
 // See grammar.txt tutorial for learning grammar syntax.
 // TODO: Add grammar tutorial.
diff --git a/validator/cpp/htmlparser/json/types.h b/validator/cpp/htmlparser/json/types.h
index 5ace320b1131..aa54f9a110c4 100644
--- a/validator/cpp/htmlparser/json/types.h
+++ b/validator/cpp/htmlparser/json/types.h
@@ -1,7 +1,7 @@
 // Declares types in json spec (http://www.json.org):
-// JsonArray: List of heterogenous types. [1, true, "foo",...]
+// JsonArray: List of hetrogenous types. [1, true, "foo",...]
 //
-// JsonDict = Key value pairs of heterogenous values, key is always std::string.
+// JsonDict = Key value pairs of hetrogenous values, key is always std::string.
 // {"foo": "bar", "count": 1,...}
 //
 // JsonObject = Encapsulates any type:
diff --git a/validator/cpp/htmlparser/node.h b/validator/cpp/htmlparser/node.h
index a9c001bd939b..31b8c9482ce4 100644
--- a/validator/cpp/htmlparser/node.h
+++ b/validator/cpp/htmlparser/node.h
@@ -61,7 +61,7 @@ class Node {
   // This does not change order or parent/child relationship of this or child
   // nodes in the tree.
   // Generally, treat this as a private function. Part of public interface for
-  // some specific scenarios:
+  // some specific sceanrios:
   // A) Unit testing.
   // B) When parsing a fragment.
   // C) Custom error/warning reporting.
diff --git a/validator/cpp/htmlparser/parser.cc b/validator/cpp/htmlparser/parser.cc
index 31b213a82e67..1ddbd303054d 100644
--- a/validator/cpp/htmlparser/parser.cc
+++ b/validator/cpp/htmlparser/parser.cc
@@ -396,7 +396,7 @@ void Parser::AddText(const std::string& text) {
 
   text_node->data_.assign(text, 0, text.size());
   AddChild(text_node);
-  // Count number of terms in the text node, except if this is <script>,
+  // Count number of terms in ths text node, except if this is <script>,
   // <textarea> or a comment node.
   if (count_num_terms_in_text_node_ && text_node->Parent() &&
       text_node->Parent()->DataAtom() != Atom::SCRIPT &&
@@ -1140,7 +1140,7 @@ bool Parser::InBodyIM() {  // NOLINT
       ReconstructActiveFormattingElements();
       AddText(d);
       if (frameset_ok_ && !Strings::IsAllWhitespaceChars(d)) {
-        // There were non-whitespace characters inserted.
+        // There were non-whitespace chracters inserted.
         frameset_ok_ = false;
       }
       break;
diff --git a/validator/cpp/htmlparser/parser_test.cc b/validator/cpp/htmlparser/parser_test.cc
index c001b1133443..4a5a74de57ed 100644
--- a/validator/cpp/htmlparser/parser_test.cc
+++ b/validator/cpp/htmlparser/parser_test.cc
@@ -309,7 +309,7 @@ TEST(ParserTest, LineBreakAtPeekableCharacter) {
 
 // Tests duplicate body tags are ignored but their attributes copied to original
 // body tag.
-TEST(ParserTest, SubsequentlyBodyTagAttributesCopied) {
+TEST(ParserTest, SubsequentyBodyTagAttributesCopied) {
   std::string html = ("<html>\n<body id=\"bdy\">\n<div>hello</div></body>"s
                       "<body class=\"bd-cls\"><div>world</div></body></html>");
   htmlparser::Parser parser(html);
diff --git a/validator/cpp/htmlparser/strings.cc b/validator/cpp/htmlparser/strings.cc
index 44ee387d3b72..999ab6622912 100644
--- a/validator/cpp/htmlparser/strings.cc
+++ b/validator/cpp/htmlparser/strings.cc
@@ -826,7 +826,7 @@ std::pair<int, int> UnescapeEntity(std::string* b, int dst, int src,
       // Replace characters from Windows-1252 with UTF-8 equivalents.
       x = kReplacementTable[x - 0x80];
     } else if (x == 0 || (0xD800 <= x && x <= 0xDFFF) || x > 0x10FFFF) {
-      // Replace invalid characters with the replacement character.
+      // Replace invalid characters with the replacement chracter.
       x = L'\uFFFD';
     }
 
@@ -839,7 +839,7 @@ std::pair<int, int> UnescapeEntity(std::string* b, int dst, int src,
     }
   }
 
-  // Consume the maximum number of characters possible, with the consumed
+  // Consume the maximum number of chracters possible, with the consumed
   // characters matching one of the named references.
   while (i < s.size()) {
     auto c = s.at(i);
@@ -953,7 +953,7 @@ bool ExtractChars(std::string_view str, std::vector<char32_t>* chars) {
   while (!str.empty()) {
     uint8_t c = str.front() & 0xff;
 
-    // ASCII characters first.
+    // ASCII chracters first.
     if (IsOneByteASCIIChar(c)) {
       chars->push_back(c);
       str.remove_prefix(1);
diff --git a/validator/cpp/htmlparser/strings.h b/validator/cpp/htmlparser/strings.h
index 52b837a73d6b..67ef42e54d69 100644
--- a/validator/cpp/htmlparser/strings.h
+++ b/validator/cpp/htmlparser/strings.h
@@ -132,7 +132,7 @@ class Strings {
     std::vector<char32_t> out;
     out.reserve(utf8.size() / 2);
     // We use the UnicodeText abstraction because it handles
-    // validation / conversion under the hood, so what comes out of this is
+    // validation / coersion  under the hood, so what comes out of this is
     // surely valid UTF8.
     auto codepoint = DecodeUtf8Symbol(&utf8);
     while (codepoint) {
@@ -194,7 +194,7 @@ class Strings {
   static void ToLower(std::string* s);
   static void ToUpper(std::string* s);
 
-  // Checks if string contains whitespace only characters.
+  // Checks if string contains whitespace only chracters.
   static bool IsAllWhitespaceChars(std::string_view s,
       std::string_view whitespace_chars = kWhitespace);
 
diff --git a/validator/cpp/htmlparser/strings_test.cc b/validator/cpp/htmlparser/strings_test.cc
index ec34074dfc7b..2ae273c41c4b 100644
--- a/validator/cpp/htmlparser/strings_test.cc
+++ b/validator/cpp/htmlparser/strings_test.cc
@@ -493,7 +493,7 @@ TEST(StringsTest, TranslateTest) {
   // Translate failed.
   EXPECT_FALSE(t8.has_value());
 
-  // Translate ignore characters if abc is longer than xyz.
+  // Translate ignore chracters if abc is longer than xyz.
   // In the following abc string ...wn is removed from translated string.
   auto t9 = htmlparser::Strings::Translate(
       "The quick brown fox.", "brown", "red");
diff --git a/validator/cpp/htmlparser/url.cc b/validator/cpp/htmlparser/url.cc
index 1352e45cc14f..00d6154f3ab9 100644
--- a/validator/cpp/htmlparser/url.cc
+++ b/validator/cpp/htmlparser/url.cc
@@ -145,9 +145,6 @@ void URL::ParseAuthority() {
     }
     idx++;
   }
-  // Save off whatever is left as the path + params + fragment.
-  // We don't further parse this.
-  path_params_fragment_ = url_.substr(idx);
 
   // Extract the login string if one was found.
   if (at_idx != -1) {
diff --git a/validator/cpp/htmlparser/url.h b/validator/cpp/htmlparser/url.h
index 26129eb87a15..035be80b722c 100644
--- a/validator/cpp/htmlparser/url.h
+++ b/validator/cpp/htmlparser/url.h
@@ -1,4 +1,4 @@
-// Uniform resource locator parsing related static functions.
+// Uniform resouce locator parsing related static functions.
 
 #ifndef CPP_HTMLPARSER_URL_H_
 #define CPP_HTMLPARSER_URL_H_
@@ -28,9 +28,6 @@ class URL {
   std::string hostname() const { return host_; }
   std::string login() const { return login_; }
   int port() const { return port_; }
-  std::string_view path_params_fragment() const {
-    return path_params_fragment_;
-  }
 
  private:
   static bool IsAlphaNum(uint8_t c) {
@@ -82,7 +79,6 @@ class URL {
   std::string login_;
   std::string host_;
   int port_;
-  std::string_view path_params_fragment_;
 };
 
 }  // namespace htmlparser
diff --git a/validator/cpp/htmlparser/url_test.cc b/validator/cpp/htmlparser/url_test.cc
index a05dbca6619d..27a098299734 100644
--- a/validator/cpp/htmlparser/url_test.cc
+++ b/validator/cpp/htmlparser/url_test.cc
@@ -41,7 +41,6 @@ TEST(URLTest, BasicTests) {
   EXPECT_EQ(url.protocol(), "http");
   EXPECT_EQ(url.hostname(), "www.google.com");
   EXPECT_EQ(url.port(), 80);
-  EXPECT_EQ(url.path_params_fragment(), "/");
 
   URL https_url("https://www.google.com/");
   EXPECT_TRUE(https_url.has_protocol());
@@ -92,11 +91,9 @@ TEST(URLTest, BasicTests) {
   EXPECT_EQ(port_url.protocol(), "http");
   EXPECT_EQ(port_url.hostname(), "www.google.com");
   EXPECT_EQ(port_url.port(), 8080);
-  EXPECT_EQ(url.path_params_fragment(), "/");
 
   URL port_url2("http://www.google.com:0080/foo:8080");
   EXPECT_EQ(port_url2.port(), 80);
-  EXPECT_EQ(url.path_params_fragment(), "/foo:8080");
 
   // Invalid port.
   URL invalid_port("http://www.google.com:99999/foo");
@@ -114,7 +111,6 @@ TEST(URLTest, BasicTests) {
   URL ipv6("http://[::2]/foo");
   EXPECT_TRUE(ipv6.is_valid());
   EXPECT_EQ(ipv6.hostname(), "::2");
-  EXPECT_EQ(ipv6.path_params_fragment(), "/foo");
 
   URL ipv62("http://foo:bar@[1:2:3::4]:8080/foo");
   EXPECT_TRUE(ipv62.is_valid());
@@ -177,7 +173,7 @@ TEST(URLTest, IPv6Urls) {
   EXPECT_TRUE(URL("http://[1:2:3:4:5:6::abc]").is_valid());
   EXPECT_TRUE(URL("http://[1:2:3:4:5:6::abcd]").is_valid());
 
-  // Illegal characters.
+  // Illegal characeters.
   EXPECT_FALSE(URL("http://[abcd:123_:abcd::]").is_valid());
   EXPECT_FALSE(URL("http://[abcd:123O:abcd::]").is_valid());
   // Two compression not valid.
diff --git a/validator/cpp/htmlparser/validators/ipaddress_test.cc b/validator/cpp/htmlparser/validators/ipaddress_test.cc
index 2dbaad61996f..fc3e9584ab02 100644
--- a/validator/cpp/htmlparser/validators/ipaddress_test.cc
+++ b/validator/cpp/htmlparser/validators/ipaddress_test.cc
@@ -112,7 +112,7 @@ TEST(ParserTest, InValidURLs) {
   EXPECT_EQ(V("[xyz::abcd:0a]").second.second, 2 /* x */);
   // More than 4 bytes.
   EXPECT_FALSE(V("[abcd:1234:abcde::]").first);
-  // Illegal characters.
+  // Illegal characeters.
   EXPECT_FALSE(V("[abcd:1234:abcd#::]").first);
   EXPECT_FALSE(V("[abcd:123_:abcd::]").first);
   EXPECT_FALSE(V("[abcd:123O:abcd::]").first);
diff --git a/validator/cpp/htmlparser/validators/json_test.cc b/validator/cpp/htmlparser/validators/json_test.cc
index a610a4fdb6e2..5b9f37adc04d 100644
--- a/validator/cpp/htmlparser/validators/json_test.cc
+++ b/validator/cpp/htmlparser/validators/json_test.cc
@@ -102,7 +102,7 @@ TEST(ParserTest, ValidJson) {
   EXPECT_TRUE(V("[\"amaltas\", \"seol\", \"hello\", \"ok\\uA93Cbye\"]").first);
   EXPECT_TRUE(V("[true, false, false, true, true, null]").first);
   EXPECT_TRUE(V("[1.0, 2.0, 3.0, 4.0e+3, 5.12e-3, 6.40e3, 0.1, -0.1]").first);
-  // Basic with different type values.
+  // Basic with diffrent type values.
   EXPECT_TRUE(V("[1, true, \"amaltas\", 1.0, null, \"world\", false]").first);
   // Array inside array.
   EXPECT_TRUE(V("[1, [2, [3, [4, 5]]], true, false, [\"a\", \"b\"]]").first);
diff --git a/validator/cpp/htmlparser/validators/supported_media_query_test.cc b/validator/cpp/htmlparser/validators/supported_media_query_test.cc
index 7e1023ce57be..26d0b4fb044f 100644
--- a/validator/cpp/htmlparser/validators/supported_media_query_test.cc
+++ b/validator/cpp/htmlparser/validators/supported_media_query_test.cc
@@ -44,7 +44,7 @@ TEST(SupportedMediaQueryParserTest, InValidQuerySingleExpression) {
   EXPECT_EQ(r.second.second, 13 /* min is invalid expecting min-width etc. */);
 
   r = V("all and (min-width: 200px and max-width: 200px)");
-  // ------------------------------^  only single expression inside parenthesis.
+  // ------------------------------^  only single expression inside paranthesis.
   EXPECT_FALSE(r.first);
   EXPECT_EQ(r.second.second, 27 /* invalid second 'and' operator */);