diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe1c775..5c4ba6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -90,7 +90,7 @@
 
 **14.05.2021**
 * User view
-  * Indentical texts from PAIA interface not displayed twice
+  * Identical texts from PAIA interface not displayed twice
 
 **13.05.2021**
 * Fullview
@@ -265,7 +265,7 @@
   * Performance Update
 
 **05.02.2020**
-* Tooltips containting links to external systems
+* Tooltips containing links to external systems
 
 **04.02.2020**
 * Exemplar-Detail-Window
@@ -701,7 +701,7 @@
 
 **18.01.2018**
 * Library System
-  * Cancelation of reservertions 
+  * Cancellation of reservertions
 
 **09.01.2018**
 * Library System
@@ -802,14 +802,14 @@
   * Chart.js 2.7.0
 
 **07.09.2017**
-* Generell
+* General
   * W3C Validation Check (https://validator.w3.org/)
   * Wave Check (http://wave.webaim.org/)
 
 **05.09.2017**
 * Cleanup
   * Renamed example.css to new_library.css
-  * Log: Empty userid not crypted
+  * Log: Empty userid not encrypted
 
 **04.09.2017**
 * Compatibility
@@ -917,11 +917,11 @@
   
 **16.05.2017**
 * Search
-  * Yearrange adjusted
+  * Year range adjusted
 
 **11.05.2017**
 * General
-  * Search options group togehter and moved to toggable option area
+  * Search options group together and moved to toggable option area
   * New navigation bar layout
   * New material switches
   * Improved usage for mobile devices
@@ -1036,7 +1036,7 @@ Library extensions
 
 **01.03.2017**
 * Search
-  * Improved search for terme containing special characteds like -,#, etc.
+  * Improved search for terme containing special characters like -,#, etc.
   * Better simular publications
 
 **28.02.2017**
@@ -1080,7 +1080,7 @@ Library extensions
 **08.02.2017**
 * Resolved bugs
   * Frontpage trim searched values
-  * Local class seach corrected
+  * Local class search corrected
 
 * Cleanup
   * Removed CSS file from ini
@@ -1109,7 +1109,7 @@ Library extensions
 
 **23.01.2017**
 * Mail
-  * Now supporting multiple mails per library containing different subjects & adresses
+  * Now supporting multiple mails per library containing different subjects & addresses
 
 **20.01.2017**
 * Configuration
@@ -1217,7 +1217,7 @@ Library extensions
 * Updates
     * CodeIgniter 3.1.2
 * Resolved bugs
-    * Yearrange dragable
+    * Year range draggable
     * Frontpage-Assistant corrected
 * Search
     * Automatically added a space after a colon ',' -> ', '
@@ -1278,7 +1278,7 @@ Library extensions
     * LBS Driver    - Corrected "unknown"-DAIA-Date* 
 * Resolved bugs
     * Stored searches
-    * Mail from Adress
+    * Mail from Address
     * Trim username & password during login
 
 **21.09.2016**
@@ -1292,7 +1292,7 @@ Library extensions
 * Resolved Bugs
     * Bug Frontpage Search * solved
     * Link resolver switches corrected
-    * Bug Exemple 980e=a solved
+    * Bug Example 980e=a solved
 
 **15.09.2016**
 * Resolved Bugs
@@ -1301,7 +1301,7 @@ Library extensions
 **09.09.2016**
 * New features
     * Search improvements
-    * Assistent also available for frontpage
+    * Assistant also available for frontpage
 
 ###V 40
 1. Erweiterte Such-Logik Paket 1
diff --git a/README.md b/README.md
index f606d51..fcfdd48 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ PHP PECL Solr Module https://pecl.php.net/package/solr
 
 1) Download lukida
 This is the main software 
-2) Rename the libraries/lukida_newlibrary folder to something more convienient like your library/institution name
+2) Rename the libraries/lukida_newlibrary folder to something more convenient like your library/institution name
 3) Create a link from your library to kernel
 
     Linux:
@@ -37,7 +37,7 @@ This is the main software
    1) Create an empty mysql database and an user who has full access to that new database
    2) Import the mysql_import.sql file into that database
    3) Remember the database connection
-5) Point your webbrowser's document_root to the correct path by replacing /var/www/html/lukida/libaries/lukida_newlibrary and use the rewrite lines from this **Example VirtualHost**
+5) Point your webbrowser's document_root to the correct path by replacing /var/www/html/lukida/libraries/lukida_newlibrary and use the rewrite lines from this **Example VirtualHost**
 
     ```
     <VirtualHost *:80>
@@ -45,7 +45,7 @@ This is the main software
         ServerName lukida.domain.tld
 
         # Path to your new library 
-        DocumentRoot /var/www/html/lukida/libaries/lukida_newlibrary
+        DocumentRoot /var/www/html/lukida/libraries/lukida_newlibrary
         
         # Name of library
         SetEnv LIBRARY "New Library"
@@ -54,7 +54,7 @@ This is the main software
         SetEnv MODE "development"
         
         # Path to your new library 
-        <Directory /var/www/html/lukida/libaries/lukida_newlibrary>
+        <Directory /var/www/html/lukida/libraries/lukida_newlibrary>
             DirectoryIndex index.php
             AllowOverride All
             Require all granted
@@ -99,7 +99,7 @@ In order to get it running you need to customize your library (.../lukida/librar
         ```
         [domains]
         
-        ; Develpment URLs 
+        ; Development URLs
         devurl=lukida.local
 
         ; Test URLs
diff --git a/kernel/application/config/database.php b/kernel/application/config/database.php
index 4e499cb..8a3fb0b 100644
--- a/kernel/application/config/database.php
+++ b/kernel/application/config/database.php
@@ -47,7 +47,7 @@
 |				'ssl_key'    - Path to the private key file
 |				'ssl_cert'   - Path to the public key certificate file
 |				'ssl_ca'     - Path to the certificate authority file
-|				'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format
+|				'ssl_capath' - Path to a directory containing trusted CA certificates in PEM format
 |				'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
 |				'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not ('mysqli' only)
 |
diff --git a/kernel/system/core/Hooks.php b/kernel/system/core/Hooks.php
index 82c68b1..52c762d 100644
--- a/kernel/system/core/Hooks.php
+++ b/kernel/system/core/Hooks.php
@@ -74,7 +74,7 @@ class CI_Hooks {
 	/**
 	 * In progress flag
 	 *
-	 * Determines whether hook is in progress, used to prevent infinte loops
+	 * Determines whether hook is in progress, used to prevent infinite loops
 	 *
 	 * @var	bool
 	 */
diff --git a/kernel/system/core/Input.php b/kernel/system/core/Input.php
index 143babf..8cffd1e 100644
--- a/kernel/system/core/Input.php
+++ b/kernel/system/core/Input.php
@@ -712,10 +712,10 @@ protected function _clean_input_data($str)
 	 *
 	 * Internal method that helps to prevent malicious users
 	 * from trying to exploit keys we make sure that keys are
-	 * only named with alpha-numeric text and a few other items.
+	 * only named with alphanumeric text and a few other items.
 	 *
 	 * @param	string	$str	Input string
-	 * @param	bool	$fatal	Whether to terminate script exection
+	 * @param	bool	$fatal	Whether to terminate script execution
 	 *				or to return FALSE if an invalid
 	 *				key is encountered
 	 * @return	string|bool
diff --git a/kernel/system/database/DB.php b/kernel/system/database/DB.php
index f58c2e8..f3b569e 100644
--- a/kernel/system/database/DB.php
+++ b/kernel/system/database/DB.php
@@ -107,7 +107,7 @@ function &DB($params = '', $query_builder_override = NULL)
 	{
 		/**
 		 * Parse the URL from the DSN string
-		 * Database settings can be passed as discreet
+		 * Database settings can be passed as discrete
 		 * parameters or as a data source name in the first
 		 * parameter. DSNs must have this prototype:
 		 * $dsn = 'driver://username:password@hostname/database';
diff --git a/kernel/system/database/DB_query_builder.php b/kernel/system/database/DB_query_builder.php
index b9bbb50..00b75fa 100644
--- a/kernel/system/database/DB_query_builder.php
+++ b/kernel/system/database/DB_query_builder.php
@@ -2270,7 +2270,7 @@ protected function _track_aliases($table)
 		}
 
 		// Does the string contain a comma?  If so, we need to separate
-		// the string into discreet statements
+		// the string into discrete statements
 		if (strpos($table, ',') !== FALSE)
 		{
 			return $this->_track_aliases(explode(',', $table));
diff --git a/kernel/system/database/drivers/sqlite/sqlite_driver.php b/kernel/system/database/drivers/sqlite/sqlite_driver.php
index a061229..7648c1d 100644
--- a/kernel/system/database/drivers/sqlite/sqlite_driver.php
+++ b/kernel/system/database/drivers/sqlite/sqlite_driver.php
@@ -269,7 +269,7 @@ public function field_data($table)
 	 * Error
 	 *
 	 * Returns an array containing code and message of the last
-	 * database error that has occured.
+	 * database error that has occurred.
 	 *
 	 * @return	array
 	 */
diff --git a/kernel/system/libraries/Cart.php b/kernel/system/libraries/Cart.php
index 4c51e7a..c6743c3 100644
--- a/kernel/system/libraries/Cart.php
+++ b/kernel/system/libraries/Cart.php
@@ -51,7 +51,7 @@ class CI_Cart {
 
 	/**
 	 * These are the regular expression rules that we use to validate the product ID and product name
-	 * alpha-numeric, dashes, underscores, or periods
+	 * alphanumeric, dashes, underscores, or periods
 	 *
 	 * @var string
 	 */
@@ -59,7 +59,7 @@ class CI_Cart {
 
 	/**
 	 * These are the regular expression rules that we use to validate the product ID and product name
-	 * alpha-numeric, dashes, underscores, colons or periods
+	 * alphanumeric, dashes, underscores, colons or periods
 	 *
 	 * @var string
 	 */
@@ -211,22 +211,22 @@ protected function _insert($items = array())
 
 		// --------------------------------------------------------------------
 
-		// Validate the product ID. It can only be alpha-numeric, dashes, underscores or periods
+		// Validate the product ID. It can only be alphanumeric, dashes, underscores or periods
 		// Not totally sure we should impose this rule, but it seems prudent to standardize IDs.
 		// Note: These can be user-specified by setting the $this->product_id_rules variable.
 		if ( ! preg_match('/^['.$this->product_id_rules.']+$/i', $items['id']))
 		{
-			log_message('error', 'Invalid product ID.  The product ID can only contain alpha-numeric characters, dashes, and underscores');
+			log_message('error', 'Invalid product ID.  The product ID can only contain alphanumeric characters, dashes, and underscores');
 			return FALSE;
 		}
 
 		// --------------------------------------------------------------------
 
-		// Validate the product name. It can only be alpha-numeric, dashes, underscores, colons or periods.
+		// Validate the product name. It can only be alphanumeric, dashes, underscores, colons or periods.
 		// Note: These can be user-specified by setting the $this->product_name_rules variable.
 		if ($this->product_name_safe && ! preg_match('/^['.$this->product_name_rules.']+$/i'.(UTF8_ENABLED ? 'u' : ''), $items['name']))
 		{
-			log_message('error', 'An invalid name was submitted as the product name: '.$items['name'].' The name can only contain alpha-numeric characters, dashes, underscores, colons, and spaces');
+			log_message('error', 'An invalid name was submitted as the product name: '.$items['name'].' The name can only contain alphanumeric characters, dashes, underscores, colons, and spaces');
 			return FALSE;
 		}
 
diff --git a/kernel/system/libraries/Form_validation.php b/kernel/system/libraries/Form_validation.php
index 3444c65..55b0915 100644
--- a/kernel/system/libraries/Form_validation.php
+++ b/kernel/system/libraries/Form_validation.php
@@ -1296,7 +1296,7 @@ public function alpha($str)
 	// --------------------------------------------------------------------
 
 	/**
-	 * Alpha-numeric
+	 * Alphanumeric
 	 *
 	 * @param	string
 	 * @return	bool
@@ -1309,7 +1309,7 @@ public function alpha_numeric($str)
 	// --------------------------------------------------------------------
 
 	/**
-	 * Alpha-numeric w/ spaces
+	 * Alphanumeric w/ spaces
 	 *
 	 * @param	string
 	 * @return	bool
@@ -1322,7 +1322,7 @@ public function alpha_numeric_spaces($str)
 	// --------------------------------------------------------------------
 
 	/**
-	 * Alpha-numeric with underscores and dashes
+	 * Alphanumeric with underscores and dashes
 	 *
 	 * @param	string
 	 * @return	bool
diff --git a/kernel/system/libraries/Image_lib.php b/kernel/system/libraries/Image_lib.php
index b9adcd6..4d7e06b 100644
--- a/kernel/system/libraries/Image_lib.php
+++ b/kernel/system/libraries/Image_lib.php
@@ -852,7 +852,7 @@ public function image_process_gd($action = 'resize')
 	 */
 	public function image_process_imagemagick($action = 'resize')
 	{
-		// Do we have a vaild library path?
+		// Do we have a valid library path?
 		if ($this->library_path === '')
 		{
 			$this->set_error('imglib_libpath_invalid');
diff --git a/kernel/system/libraries/Table.php b/kernel/system/libraries/Table.php
index 36da513..dd904b9 100644
--- a/kernel/system/libraries/Table.php
+++ b/kernel/system/libraries/Table.php
@@ -147,7 +147,7 @@ public function set_template($template)
 	/**
 	 * Set the table heading
 	 *
-	 * Can be passed as an array or discreet params
+	 * Can be passed as an array or discrete params
 	 *
 	 * @param	mixed
 	 * @return	CI_Table
@@ -211,7 +211,7 @@ public function make_columns($array = array(), $col_limit = 0)
 	/**
 	 * Set "empty" cells
 	 *
-	 * Can be passed as an array or discreet params
+	 * Can be passed as an array or discrete params
 	 *
 	 * @param	mixed	$value
 	 * @return	CI_Table
@@ -227,7 +227,7 @@ public function set_empty($value)
 	/**
 	 * Add a table row
 	 *
-	 * Can be passed as an array or discreet params
+	 * Can be passed as an array or discrete params
 	 *
 	 * @param	mixed
 	 * @return	CI_Table
diff --git a/libraries/Lukida_newlibrary/general.ini b/libraries/Lukida_newlibrary/general.ini
index f14d229..152ca52 100644
--- a/libraries/Lukida_newlibrary/general.ini
+++ b/libraries/Lukida_newlibrary/general.ini
@@ -32,7 +32,7 @@ printsignatures=false
 ; Multiple domains possible by using ,
 ; if https and http should work concurrently, please enter https domain before http domain
 
-; Develpment URLs
+; Development URLs
 devurl=example.local,example.devhost
 
 ; Test URLs