@@ -1821,7 +1821,7 @@ int cli_bytecode_run(const struct cli_all_bc *bcs, const struct cli_bc *bc, stru

 	inst.u.ops.funcid = ctx->funcid;

 	inst.u.ops.ops = ctx->operands;

 	inst.u.ops.opsizes = ctx->opsizes;

-	cli_dbgmsg("Bytecode %u: executing in interpeter mode\n", bc->id);

+	cli_dbgmsg("Bytecode %u: executing in interpreter mode\n", bc->id);

 	ctx->on_jit = 0;

@@ -52,7 +52,7 @@

 using namespace llvm;

 #if LLVM_VERSION < 29

-/* function is succeeded in later LLVM with LLVM correspoding standalone */

+/* function is succeeded in later LLVM with LLVM corresponding standalone */

 static Value *GetUnderlyingObject(Value *P, TargetData *TD)

 {

     return P->getUnderlyingObject();

@@ -2736,7 +2736,7 @@ int cli_bytecode_prepare_jit(struct cli_all_bc *bcs)

 		 badalloc.what());

       return CL_EMEM;

   } catch (...) {

-      cli_errmsg("[Bytecode JIT]: Unexpected unknown exception occured\n");

+      cli_errmsg("[Bytecode JIT]: Unexpected unknown exception occurred\n");

       return CL_EBYTECODE;

   }

   return 0;

@@ -162,7 +162,7 @@ enum X86OPS {

   OP_RCR,/**< Rotate Carry Right */

   OP_RDMSR,/**< Read from Model Specific Register */

   OP_RDPMC,/**< Read Performance Monitoring Counters */

-  OP_RDTSC,/**< Read Time-Stamp Coutner */

+  OP_RDTSC,/**< Read Time-Stamp Counter */

   OP_PREFIX_REPE,/**< Repeat String Operation Prefix while Equal */

   OP_PREFIX_REPNE,/**< Repeat String Operation Prefix while Not Equal */

   OP_RETF,/**< Return from Far Procedure */

@@ -134,9 +134,9 @@ static inline void PROFILE_REPORT(const struct cli_hashtable *s)

 	size_t lookups, queries, insert_tries, inserts;

 	cli_dbgmsg("--------Hashtable usage report for %p--------------\n",(const void*)s);

 	cli_dbgmsg("hash function calculations:%ld\n",s->PROFILE_STRUCT.calc_hash);

-	cli_dbgmsg("successfull finds/total searches: %ld/%ld; lookups: %ld\n", s->PROFILE_STRUCT.found, s->PROFILE_STRUCT.find_req, s->PROFILE_STRUCT.found_tries);

-	cli_dbgmsg("unsuccessfull finds/total searches: %ld/%ld; lookups: %ld\n", s->PROFILE_STRUCT.not_found, s->PROFILE_STRUCT.find_req , s->PROFILE_STRUCT.not_found_tries);

-	cli_dbgmsg("successfull finds during grow:%ld; lookups: %ld\n",s->PROFILE_STRUCT.grow_found, s->PROFILE_STRUCT.grow_found_tries);

+	cli_dbgmsg("successful finds/total searches: %ld/%ld; lookups: %ld\n", s->PROFILE_STRUCT.found, s->PROFILE_STRUCT.find_req, s->PROFILE_STRUCT.found_tries);

+	cli_dbgmsg("unsuccessful finds/total searches: %ld/%ld; lookups: %ld\n", s->PROFILE_STRUCT.not_found, s->PROFILE_STRUCT.find_req , s->PROFILE_STRUCT.not_found_tries);

+	cli_dbgmsg("successful finds during grow:%ld; lookups: %ld\n",s->PROFILE_STRUCT.grow_found, s->PROFILE_STRUCT.grow_found_tries);

 	lookups = s->PROFILE_STRUCT.found_tries + s->PROFILE_STRUCT.not_found_tries + s->PROFILE_STRUCT.grow_found_tries;

 	queries = s->PROFILE_STRUCT.find_req + s->PROFILE_STRUCT.grow_found;

 	cli_dbgmsg("Find Lookups/total queries: %ld/%ld = %3f\n", lookups, queries, lookups*1.0/queries);

@@ -739,7 +739,7 @@ static inline size_t cli_hashset_search(const struct cli_hashset* hs, const uint

 	size_t idx = hash32shift(key) & (hs->mask);

 	size_t tries = 1;

-	/* check wether the entry is used, and if the key matches */

+	/* check whether the entry is used, and if the key matches */

 	while(BITMAP_CONTAINS(hs->bitmap, idx) && (hs->keys[idx] != key)) {

 		/* entry used, key different -> collision */

 		idx = (idx + tries++)&(hs->mask);

@@ -1036,7 +1036,7 @@ static inline int parsehwp3_paragraph(cli_ctx *ctx, fmap_t *map, int p, int leve

                     hwp3_debug("HWP3.x: Paragraph[%d, %d]: box object contains %u cell(s)\n", level, p, ncells);

-                    /* cell informations (27 bytes x ncells(offset 80 of table)) */

+                    /* cell information (27 bytes x ncells(offset 80 of table)) */

                     hwp3_debug("HWP3.x: Paragraph[%d, %d]: box cell info array starts @ %llu\n", level, p, (long long unsigned)offset);

                     offset += (27 * ncells);

@@ -1525,7 +1525,7 @@ static inline int parsehwp3_infoblk_1(cli_ctx *ctx, fmap_t *dmap, off_t *offset,

 #endif

     if (fmap_readn(map, &infoid, (*offset), sizeof(infoid)) != sizeof(infoid)) {

-        cli_errmsg("HWP3.x: Failed to read infomation block id @ %llu\n",

+        cli_errmsg("HWP3.x: Failed to read information block id @ %llu\n",

                    (long long unsigned)(*offset));

         return CL_EREAD;

     }

@@ -1547,16 +1547,16 @@ static inline int parsehwp3_infoblk_1(cli_ctx *ctx, fmap_t *dmap, off_t *offset,

     /* Booking Information(5) - no length field and no content */

     if (infoid == 5) {

-        hwp3_debug("HWP3.x: Information Block[%llu]: TYPE: Booking Infomation\n", infoloc);

+        hwp3_debug("HWP3.x: Information Block[%llu]: TYPE: Booking Information\n", infoloc);

 #if HAVE_JSON

         if (ctx->options & CL_SCAN_FILE_PROPERTIES)

-            cli_jsonstr(entry, "Type", "Booking Infomation");

+            cli_jsonstr(entry, "Type", "Booking Information");

 #endif

         return CL_SUCCESS;

     }

     if (fmap_readn(map, &infolen, (*offset), sizeof(infolen)) != sizeof(infolen)) {

-        cli_errmsg("HWP3.x: Failed to read infomation block len @ %llu\n",

+        cli_errmsg("HWP3.x: Failed to read information block len @ %llu\n",

                    (long long unsigned)(*offset));

         return CL_EREAD;

     }

@@ -1602,7 +1602,7 @@ static inline int parsehwp3_infoblk_1(cli_ctx *ctx, fmap_t *dmap, off_t *offset,

 #if HWP3_DEBUG /* additional fields can be added */

         memset(field, 0, HWP3_FIELD_LENGTH);

         if (fmap_readn(map, field, (*offset), 16) != 16) {

-            cli_errmsg("HWP3.x: Failed to read infomation block field @ %llu\n",

+            cli_errmsg("HWP3.x: Failed to read information block field @ %llu\n",

                        (long long unsigned)(*offset));

             return CL_EREAD;

         }

@@ -1610,7 +1610,7 @@ static inline int parsehwp3_infoblk_1(cli_ctx *ctx, fmap_t *dmap, off_t *offset,

         memset(field, 0, HWP3_FIELD_LENGTH);

         if (fmap_readn(map, field, (*offset)+16, 16) != 16) {

-            cli_errmsg("HWP3.x: Failed to read infomation block field @ %llu\n",

+            cli_errmsg("HWP3.x: Failed to read information block field @ %llu\n",

                        (long long unsigned)(*offset));

             return CL_EREAD;

         }

@@ -1630,7 +1630,7 @@ static inline int parsehwp3_infoblk_1(cli_ctx *ctx, fmap_t *dmap, off_t *offset,

             ret = cli_map_scan(map, (*offset), infolen, ctx, CL_TYPE_ANY);

         break;

     case 3: /* Hypertext/Hyperlink Information */

-        hwp3_debug("HWP3.x: Information Block[%llu]: TYPE: Hypertext/Hyperlink Infomation\n", infoloc);

+        hwp3_debug("HWP3.x: Information Block[%llu]: TYPE: Hypertext/Hyperlink Information\n", infoloc);

         if (infolen % 617) {

             cli_errmsg("HWP3.x: Information Block[%llu]: Invalid multiple of 617 => %u\n", infoloc, infolen);

             return CL_EFORMAT;

@@ -1640,7 +1640,7 @@ static inline int parsehwp3_infoblk_1(cli_ctx *ctx, fmap_t *dmap, off_t *offset,

         hwp3_debug("HWP3.x: Information Block[%llu]: COUNT: %d entries\n", infoloc, count);

 #if HAVE_JSON

         if (ctx->options & CL_SCAN_FILE_PROPERTIES) {

-            cli_jsonstr(entry, "Type", "Hypertext/Hyperlink Infomation");

+            cli_jsonstr(entry, "Type", "Hypertext/Hyperlink Information");

             cli_jsonint(entry, "Count", count);

         }

 #endif

@@ -1649,7 +1649,7 @@ static inline int parsehwp3_infoblk_1(cli_ctx *ctx, fmap_t *dmap, off_t *offset,

 #if HWP3_DEBUG /* additional fields can be added */

             memset(field, 0, HWP3_FIELD_LENGTH);

             if (fmap_readn(map, field, (*offset), 256) != 256) {

-                cli_errmsg("HWP3.x: Failed to read infomation block field @ %llu\n",

+                cli_errmsg("HWP3.x: Failed to read information block field @ %llu\n",

                            (long long unsigned)(*offset));

                 return CL_EREAD;

             }

@@ -1669,7 +1669,7 @@ static inline int parsehwp3_infoblk_1(cli_ctx *ctx, fmap_t *dmap, off_t *offset,

         break;

     case 5: /* Booking Information */

         /* should never run this as it is short-circuited above */

-        hwp3_debug("HWP3.x: Information Block[%llu]: TYPE: Booking Infomation\n", infoloc);

+        hwp3_debug("HWP3.x: Information Block[%llu]: TYPE: Booking Information\n", infoloc);

 #if HAVE_JSON

         if (ctx->options & CL_SCAN_FILE_PROPERTIES)

             cli_jsonstr(entry, "Type", "Booking Information");

@@ -1686,7 +1686,7 @@ static inline int parsehwp3_infoblk_1(cli_ctx *ctx, fmap_t *dmap, off_t *offset,

 #if HWP3_DEBUG /* additional fields can be added */

         memset(field, 0, HWP3_FIELD_LENGTH);

         if (fmap_readn(map, field, (*offset)+24, 256) != 256) {

-            cli_errmsg("HWP3.x: Failed to read infomation block field @ %llu\n",

+            cli_errmsg("HWP3.x: Failed to read information block field @ %llu\n",

                        (long long unsigned)(*offset));

             return CL_EREAD;

         }

@@ -2074,7 +2074,7 @@ int cli_scanhwpml(cli_ctx *ctx)

     reader = xmlReaderForIO(msxml_read_cb, NULL, &cbdata, "hwpml.xml", NULL, CLAMAV_MIN_XMLREADER_FLAGS);

     if (!reader) {

-        cli_dbgmsg("cli_scanhwpml: cannot intialize xmlReader\n");

+        cli_dbgmsg("cli_scanhwpml: cannot initialize xmlReader\n");

 #if HAVE_JSON

         ret = cli_json_parse_error(ctx->wrkproperty, "HWPML_ERROR_XML_READER_IO");

@@ -871,7 +871,7 @@ void cli_js_parse_done(struct parser_state* state)

 	}

 	if (end != '\0')

 		cli_js_process_buffer(state, &end, 1);

-	/* close remaining paranthesis */

+	/* close remaining parenthesis */

 	for (i=0;i<tokens->cnt;i++) {

 		if (tokens->data[i].type == TOK_PAR_OPEN)

 			par_balance++;

@@ -887,7 +887,7 @@ void cli_js_parse_done(struct parser_state* state)

 		}

 	}

-	/* we had to close unfinished strings, paranthesis,

+	/* we had to close unfinished strings, parenthesis,

 	 * so that the folders/decoders can run properly */

 	run_folders(&state->tokens);

 	run_decoders(state);

@@ -444,7 +444,7 @@ int cli_pcre_build(struct cli_matcher *root, long long unsigned match_limit, lon

             ret = cli_pcre_compile(&(pm->pdata), match_limit, recmatch_limit, 0, 0);

         }

         else {

-            /* compile the regex, options overrided and disabled */

+            /* compile the regex, options overridden and disabled */

             pm_dbgmsg("cli_pcre_build: Compiling regex: /%s/ (without options)\n", pm->pdata.expression);

             ret = cli_pcre_compile(&(pm->pdata), match_limit, recmatch_limit, 0, 1);

         }

@@ -627,7 +627,7 @@ int cli_pcre_scanbuf(const unsigned char *buffer, uint32_t length, const char **

                     continue;

         }

         else {

-            cli_dbgmsg("cli_pcre_scanbuf: skipping %s check due to unintialized lsigid\n", pm->trigger);

+            cli_dbgmsg("cli_pcre_scanbuf: skipping %s check due to uninitialized lsigid\n", pm->trigger);

             /* fall-through to unconditional execution - sigtool-only */

         }

@@ -1046,7 +1046,7 @@ parseEmailHeader(message *m, const char *line, const table_t *rfc821)

 	 * In RFC822 the separater between the key a value is a colon,

 	 * e.g.	Content-Transfer-Encoding: base64

 	 * However some MUA's are lapse about this and virus writers exploit

-	 * this hole, so we need to check all known possiblities

+	 * this hole, so we need to check all known possibilities

 	 */

 	for(separater = ":= "; *separater; separater++)

 		if(strchr(line, *separater) != NULL)

@@ -134,7 +134,7 @@ int cli_mbr_check2(cli_ctx *ctx, size_t sectorsize) {

     return mbr_check_mbr(&mbr, maplen, sectorsize);

 }

-/* sets sectorsize to default value if specfied to be 0 */

+/* sets sectorsize to default value if specified to be 0 */

 int cli_scanmbr(cli_ctx *ctx, size_t sectorsize)

 {

     struct mbr_boot_record mbr;

@@ -225,7 +225,7 @@ int cli_scanmbr(cli_ctx *ctx, size_t sectorsize)

                 cli_dbgmsg("cli_scanmbr: detected a master boot record "

                            "with multiple extended partitions\n");

             }

-            state = SEEN_EXTENDED; /* used only to detect mutiple extended partitions */

+            state = SEEN_EXTENDED; /* used only to detect multiple extended partitions */

             ret = mbr_scanextprtn(ctx, &prtncount, mbr.entries[i].firstLBA, 

                                   mbr.entries[i].numLBA, sectorsize);

@@ -566,7 +566,7 @@ static int msxml_parse_element(struct msxml_ctx *mxctx, xmlTextReaderPtr reader,

     return (virus ? CL_VIRUS : CL_SUCCESS);

 }

-/* reader intialization and closing handled by caller */

+/* reader initialization and closing handled by caller */

 int cli_msxml_parse_document(cli_ctx *ctx, xmlTextReaderPtr reader, const struct key_entry *keys, const size_t num_keys, uint32_t flags, struct msxml_ctx *mxctx)

 {

     struct msxml_ctx reserve;

@@ -663,7 +663,7 @@ int cli_msxml_parse_document(cli_ctx *ctx, xmlTextReaderPtr reader, const struct

     }

 #endif

-    /* non-critical return supression */

+    /* non-critical return suppression */

     if (ret == CL_ETIMEOUT || ret == CL_BREAK)

         ret = CL_SUCCESS;

@@ -272,7 +272,7 @@ struct cl_engine {

 				     * within a single archive

 				     */

     /* This is for structured data detection.  You can set the minimum

-     * number of occurences of an CC# or SSN before the system will

+     * number of occurrences of an CC# or SSN before the system will

      * generate a notification.

      */

     uint32_t min_cc_count;

@@ -990,7 +990,7 @@ struct pdf_array *pdf_parse_array(struct pdf_struct *pdf, struct pdf_obj *obj, s

                     break;

                 }

-                /* Not a dictionary. Intentially fall through. */

+                /* Not a dictionary. Intentionally fall through. */

             case '(':

                 val = pdf_parse_string(pdf, obj, begin, objsz, NULL, &begin, NULL);

                 begin += 2;

@@ -3166,13 +3166,13 @@ int cli_scanpe(cli_ctx *ctx)

     cli_dbgmsg("------------------------------------\n");

     if (DETECT_BROKEN_PE && !native && (!(pe_plus?EC32(optional_hdr64.SectionAlignment):EC32(optional_hdr32.SectionAlignment)) || (pe_plus?EC32(optional_hdr64.SectionAlignment):EC32(optional_hdr32.SectionAlignment))%0x1000)) {

-        cli_dbgmsg("Bad virtual alignemnt\n");

+        cli_dbgmsg("Bad virtual alignment\n");

         cli_append_virus(ctx,"Heuristics.Broken.Executable");

         return CL_VIRUS;

     }

     if (DETECT_BROKEN_PE && !native && (!(pe_plus?EC32(optional_hdr64.FileAlignment):EC32(optional_hdr32.FileAlignment)) || (pe_plus?EC32(optional_hdr64.FileAlignment):EC32(optional_hdr32.FileAlignment))%0x200)) {

-        cli_dbgmsg("Bad file alignemnt\n");

+        cli_dbgmsg("Bad file alignment\n");

         cli_append_virus(ctx, "Heuristics.Broken.Executable");

         return CL_VIRUS;

     }

@@ -68,7 +68,7 @@ static int add_static_pattern(struct regex_matcher *matcher, char* pattern);

 #define MATCH_FAILED  -1

 /*

- * Call this function when an unrecoverable error has occured, (instead of exit).

+ * Call this function when an unrecoverable error has occurred, (instead of exit).

  */

 static void fatal_error(struct regex_matcher* matcher)

 {

@@ -252,7 +252,7 @@ int regex_list_match(struct regex_matcher* matcher,char* real_url,const char* di

 /* Initialization & loading */

-/* Initializes @matcher, allocating necesarry substructures */

+/* Initializes @matcher, allocating necessary substructures */

 int init_regex_list(struct regex_matcher* matcher, uint8_t dconf_prefiltering)

 {

 #ifdef USE_MPOOL

@@ -1166,7 +1166,7 @@ expression

             yyscanner, OP_INCR_M, mem_offset + 2, NULL);

         // If next string is not undefined, go back to the

-        // begining of the loop.

+        // beginning of the loop.

         yr_parser_emit_with_arg_reloc(

             yyscanner,

             OP_JNUNDEF,