diff --git a/src/Phalcon/Annotations/AnnotationsFactory.php b/src/Phalcon/Annotations/AnnotationsFactory.php
index 2428e9fa..0ede1c60 100644
--- a/src/Phalcon/Annotations/AnnotationsFactory.php
+++ b/src/Phalcon/Annotations/AnnotationsFactory.php
@@ -37,7 +37,7 @@ public function __construct(array $services = array())
      *     ]
      * ]
      *
-     * Factory to create an instace from a Config object
+     * Factory to create an instance from a Config object
      * @return mixed
      */
     public function load($config)
diff --git a/src/Phalcon/Assets/AssetInterface.php b/src/Phalcon/Assets/AssetInterface.php
index bbc486c9..320f6317 100644
--- a/src/Phalcon/Assets/AssetInterface.php
+++ b/src/Phalcon/Assets/AssetInterface.php
@@ -10,7 +10,7 @@
 namespace Phalcon\Assets;
 
 /**
- * Interface for custom Phalcon\Assets reources
+ * Interface for custom Phalcon\Assets resources
  */
 interface AssetInterface
 {
diff --git a/src/Phalcon/Cache/CacheFactory.php b/src/Phalcon/Cache/CacheFactory.php
index a78c1bf2..ad026d3d 100644
--- a/src/Phalcon/Cache/CacheFactory.php
+++ b/src/Phalcon/Cache/CacheFactory.php
@@ -32,7 +32,7 @@ public function __construct(AdapterFactory $factory)
     }
 
     /**
-     * Factory to create an instace from a Config object
+     * Factory to create an instance from a Config object
      *
      * @param array|\Phalcon\Config $config = [
      *     'adapter' => 'apcu',
diff --git a/src/Phalcon/Db/Adapter/PdoFactory.php b/src/Phalcon/Db/Adapter/PdoFactory.php
index b539b732..fb41d198 100644
--- a/src/Phalcon/Db/Adapter/PdoFactory.php
+++ b/src/Phalcon/Db/Adapter/PdoFactory.php
@@ -32,7 +32,7 @@ public function __construct(array $services = array())
     }
 
     /**
-     * Factory to create an instace from a Config object
+     * Factory to create an instance from a Config object
      *
      * @param array|\Phalcon\Config $config = [
      *     'adapter' => 'mysql',
diff --git a/src/Phalcon/Db/Result/Pdo.php b/src/Phalcon/Db/Result/Pdo.php
index ab2ffa8f..f8efc724 100644
--- a/src/Phalcon/Db/Result/Pdo.php
+++ b/src/Phalcon/Db/Result/Pdo.php
@@ -98,7 +98,7 @@ public function dataSeek(int $number)
     /**
      * Allows to execute the statement again. Some database systems don't
      * support scrollable cursors. So, as cursors are forward only, we need to
-     * execute the cursor again to fetch rows from the begining
+     * execute the cursor again to fetch rows from the beginning
      *
      * @return bool
      */
diff --git a/src/Phalcon/Db/ResultInterface.php b/src/Phalcon/Db/ResultInterface.php
index 5f7abd5c..77662071 100644
--- a/src/Phalcon/Db/ResultInterface.php
+++ b/src/Phalcon/Db/ResultInterface.php
@@ -24,9 +24,9 @@ interface ResultInterface
     public function dataSeek(int $number);
 
     /**
-     * Allows to executes the statement again. Some database systems don't
+     * Allows to execute the statement again. Some database systems don't
      * support scrollable cursors. So, as cursors are forward only, we need to
-     * execute the cursor again to fetch rows from the begining
+     * execute the cursor again to fetch rows from the beginning
      *
      * @return bool
      */
diff --git a/src/Phalcon/Debug.php b/src/Phalcon/Debug.php
index 8911041f..2e18f6c4 100644
--- a/src/Phalcon/Debug.php
+++ b/src/Phalcon/Debug.php
@@ -141,10 +141,10 @@ public function listenLowSeverity(): Debug
     /**
      * Handles uncaught exceptions
      *
-     * @param \Exception $exception
+     * @param \Throwable $exception
      * @return bool
      */
-    public function onUncaughtException(\Exception $exception): bool
+    public function onUncaughtException(\Throwable $exception): bool
     {
     }
 
diff --git a/src/Phalcon/Filter/FilterFactory.php b/src/Phalcon/Filter/FilterFactory.php
index 649ba460..b2b9ffd5 100644
--- a/src/Phalcon/Filter/FilterFactory.php
+++ b/src/Phalcon/Filter/FilterFactory.php
@@ -21,7 +21,7 @@ class FilterFactory
 {
 
     /**
-     * Returns a Locator object with all the helpers defined in anonynous
+     * Returns a Locator object with all the helpers defined in anonymous
      * functions
      *
      * @return FilterInterface
diff --git a/src/Phalcon/Filter/Sanitize/UpperWords.php b/src/Phalcon/Filter/Sanitize/UpperWords.php
index a0ffce76..497cf04f 100644
--- a/src/Phalcon/Filter/Sanitize/UpperWords.php
+++ b/src/Phalcon/Filter/Sanitize/UpperWords.php
@@ -12,7 +12,7 @@
 /**
  * Phalcon\Filter\Sanitize\UpperWords
  *
- * Sanitizes a value to uppercase teh first character of each word
+ * Sanitizes a value to uppercase the first character of each word
  */
 class UpperWords
 {
diff --git a/src/Phalcon/Helper/Arr.php b/src/Phalcon/Helper/Arr.php
index a269fc1b..5f7c5025 100644
--- a/src/Phalcon/Helper/Arr.php
+++ b/src/Phalcon/Helper/Arr.php
@@ -253,7 +253,7 @@ final public static function validateAll(array $collection, $method = null): boo
 
     /**
      * Returns true if the provided function returns true for at least one
-     * element fo the collection, false otherwise.
+     * element of the collection, false otherwise.
      *
      * @param array    $collection
      * @param callable $method
diff --git a/src/Phalcon/Helper/Str.php b/src/Phalcon/Helper/Str.php
index 06393094..e2d475b8 100644
--- a/src/Phalcon/Helper/Str.php
+++ b/src/Phalcon/Helper/Str.php
@@ -83,7 +83,7 @@ final public static function concat(): string
     }
 
     /**
-     * Retuns number of vowels in provided string. Uses a regular expression
+     * Returns number of vowels in provided string. Uses a regular expression
      * to count the number of vowels (A, E, I, O, U) in a string.
      *
      * @param string $string
@@ -96,7 +96,7 @@ final public static function countVowels(string $text): int
     }
 
     /**
-     * Decapitalizes the first letter of the sring and then adds it with rest
+     * Decapitalizes the first letter of the string and then adds it with rest
      * of the string. Omit the upperRest parameter to keep the rest of the
      * string intact, or set it to true to convert to uppercase.
      *
diff --git a/src/Phalcon/Image/ImageFactory.php b/src/Phalcon/Image/ImageFactory.php
index d1814299..efe9c7c0 100644
--- a/src/Phalcon/Image/ImageFactory.php
+++ b/src/Phalcon/Image/ImageFactory.php
@@ -28,7 +28,7 @@ public function __construct(array $services = array())
     }
 
     /**
-     * Factory to create an instace from a Config object
+     * Factory to create an instance from a Config object
      *
      * @param array|\Phalcon\Config $config = [
      *     'adapter' => 'gd',
diff --git a/src/Phalcon/Logger/LoggerFactory.php b/src/Phalcon/Logger/LoggerFactory.php
index de0205bc..6dfe2189 100644
--- a/src/Phalcon/Logger/LoggerFactory.php
+++ b/src/Phalcon/Logger/LoggerFactory.php
@@ -32,7 +32,7 @@ public function __construct(AdapterFactory $factory)
     }
 
     /**
-     * Factory to create an instace from a Config object
+     * Factory to create an instance from a Config object
      *
      * @param array|\Phalcon\Config $config = [
      *     'name' => 'messages',
diff --git a/src/Phalcon/Mvc/Application.php b/src/Phalcon/Mvc/Application.php
index 338827f4..ec4e78c0 100644
--- a/src/Phalcon/Mvc/Application.php
+++ b/src/Phalcon/Mvc/Application.php
@@ -10,7 +10,6 @@
 namespace Phalcon\Mvc;
 
 use Phalcon\Application\AbstractApplication;
-use Phalcon\Mvc\ModuleDefinitionInterface;
 
 /**
  * Phalcon\Mvc\Application
diff --git a/src/Phalcon/Mvc/Micro.php b/src/Phalcon/Mvc/Micro.php
index 012171b3..ba0606f0 100644
--- a/src/Phalcon/Mvc/Micro.php
+++ b/src/Phalcon/Mvc/Micro.php
@@ -461,7 +461,7 @@ public function setModelBinder(\Phalcon\Mvc\Model\BinderInterface $modelBinder,
     }
 
     /**
-     * Appends a custom 'reponse' handler to be called insted of the default
+     * Appends a custom 'response' handler to be called instead of the default
      * response handler
      *
      * @param callable $handler
diff --git a/src/Phalcon/Mvc/Model/RelationInterface.php b/src/Phalcon/Mvc/Model/RelationInterface.php
index ed33aa25..a418e806 100644
--- a/src/Phalcon/Mvc/Model/RelationInterface.php
+++ b/src/Phalcon/Mvc/Model/RelationInterface.php
@@ -117,7 +117,7 @@ public function isReusable(): bool;
     public function isThrough(): bool;
 
     /**
-     * Sets the intermediate model dat for has--through relations
+     * Sets the intermediate model data for has--through relations
      *
      * @param string|array $intermediateFields
      * @param string|array $intermediateReferencedFields
diff --git a/src/Phalcon/Paginator/PaginatorFactory.php b/src/Phalcon/Paginator/PaginatorFactory.php
index a6ef3ec1..3b120854 100644
--- a/src/Phalcon/Paginator/PaginatorFactory.php
+++ b/src/Phalcon/Paginator/PaginatorFactory.php
@@ -33,7 +33,7 @@ public function __construct(array $services = array())
     }
 
     /**
-     * Factory to create an instace from a Config object
+     * Factory to create an instance from a Config object
      *
      * ```php
      * use Phalcon\Paginator\PaginatorFactory;
diff --git a/src/Phalcon/Storage/Adapter/Redis.php b/src/Phalcon/Storage/Adapter/Redis.php
index 5885c61e..ab56e4cc 100644
--- a/src/Phalcon/Storage/Adapter/Redis.php
+++ b/src/Phalcon/Storage/Adapter/Redis.php
@@ -103,7 +103,8 @@ public function getAdapter()
     }
 
     /**
-     * Stores data in the adapter
+     * Gets the keys from the adapter. Accepts an optional prefix which will
+     * filter the keys returned
      *
      * @return array
      * @throws Exception
diff --git a/src/Phalcon/Tag.php b/src/Phalcon/Tag.php
index c7004216..986c9330 100644
--- a/src/Phalcon/Tag.php
+++ b/src/Phalcon/Tag.php
@@ -541,7 +541,7 @@ public static function renderAttributes(string $code, array $attributes): string
     }
 
     /**
-     * Renders the title with title tags. The title is automaticall escaped
+     * Renders the title with title tags. The title is automatically escaped
      *
      * @param bool $prepend
      * @param bool $append
diff --git a/src/Phalcon/Translate/Adapter/NativeArray.php b/src/Phalcon/Translate/Adapter/NativeArray.php
index 7b35a0aa..5e0bf236 100644
--- a/src/Phalcon/Translate/Adapter/NativeArray.php
+++ b/src/Phalcon/Translate/Adapter/NativeArray.php
@@ -51,7 +51,7 @@ public function exists(string $index): bool
     }
 
     /**
-     * Whenever a key is not found this medhod will be called
+     * Whenever a key is not found this method will be called
      *
      * @param string $index
      * @return string
diff --git a/src/Phalcon/Translate/TranslateFactory.php b/src/Phalcon/Translate/TranslateFactory.php
index 59d0c027..b938f42e 100644
--- a/src/Phalcon/Translate/TranslateFactory.php
+++ b/src/Phalcon/Translate/TranslateFactory.php
@@ -39,7 +39,7 @@ public function __construct(InterpolatorFactory $interpolator, array $services =
     }
 
     /**
-     * Factory to create an instace from a Config object
+     * Factory to create an instance from a Config object
      *
      * @param array|\Phalcon\Config = [
      *     'adapter' => 'ini,
diff --git a/src/Phalcon/Validation/Validator/File/Resolution/Equal.php b/src/Phalcon/Validation/Validator/File/Resolution/Equal.php
index fdd9bd33..00c22fa6 100644
--- a/src/Phalcon/Validation/Validator/File/Resolution/Equal.php
+++ b/src/Phalcon/Validation/Validator/File/Resolution/Equal.php
@@ -12,7 +12,7 @@
 use Phalcon\Validation\Validator\File\AbstractFile;
 
 /**
- * Checks if a file has the rigth resolution
+ * Checks if a file has the right resolution
  *
  * ```php
  * use Phalcon\Validation;
diff --git a/src/Phalcon/Validation/Validator/File/Resolution/Max.php b/src/Phalcon/Validation/Validator/File/Resolution/Max.php
index eac298ab..868e9f08 100644
--- a/src/Phalcon/Validation/Validator/File/Resolution/Max.php
+++ b/src/Phalcon/Validation/Validator/File/Resolution/Max.php
@@ -12,7 +12,7 @@
 use Phalcon\Validation\Validator\File\AbstractFile;
 
 /**
- * Checks if a file has the rigth resolution
+ * Checks if a file has the right resolution
  *
  * ```php
  * use Phalcon\Validation;
diff --git a/src/Phalcon/Validation/Validator/File/Resolution/Min.php b/src/Phalcon/Validation/Validator/File/Resolution/Min.php
index 0866f57e..bd948037 100644
--- a/src/Phalcon/Validation/Validator/File/Resolution/Min.php
+++ b/src/Phalcon/Validation/Validator/File/Resolution/Min.php
@@ -12,7 +12,7 @@
 use Phalcon\Validation\Validator\File\AbstractFile;
 
 /**
- * Checks if a file has the rigth resolution
+ * Checks if a file has the right resolution
  *
  * ```php
  * use Phalcon\Validation;
diff --git a/src/Phalcon/Validation/Validator/File/Size/Equal.php b/src/Phalcon/Validation/Validator/File/Size/Equal.php
index d1c56a84..8fad03de 100644
--- a/src/Phalcon/Validation/Validator/File/Size/Equal.php
+++ b/src/Phalcon/Validation/Validator/File/Size/Equal.php
@@ -47,7 +47,7 @@
  *                 "anotherFile" => true,
  *             ],
  *             "message" => [
- *                 "file"        => "file does not have the rigth filesize",
+ *                 "file"        => "file does not have the right filesize",
  *                 "anotherFile" => "anotherFile wrong filesize (4MB)",
  *             ],
  *         ]
diff --git a/src/Phalcon/Validation/Validator/StringLength.php b/src/Phalcon/Validation/Validator/StringLength.php
index 761ad171..c6c7e05f 100644
--- a/src/Phalcon/Validation/Validator/StringLength.php
+++ b/src/Phalcon/Validation/Validator/StringLength.php
@@ -15,7 +15,7 @@
  * Validates that a string has the specified maximum and minimum constraints
  * The test is passed if for a string's length L, min<=L<=max, i.e. L must
  * be at least min, and at most max.
- * Since Phalcon v4.0 this valitor works like a container
+ * Since Phalcon v4.0 this validator works like a container
  *
  * ```php
  * use Phalcon\Validation;
diff --git a/src/Phalcon/Validation/ValidatorInterface.php b/src/Phalcon/Validation/ValidatorInterface.php
index 2019197f..1844d552 100644
--- a/src/Phalcon/Validation/ValidatorInterface.php
+++ b/src/Phalcon/Validation/ValidatorInterface.php
@@ -67,7 +67,7 @@ public function getTemplates(): array;
     public function setTemplates(array $templates): ValidatorInterface;
 
     /**
-     * Set a new temlate message
+     * Set a new template message
      *
      * @return ValidatorInterface
      * @param string $template