diff --git a/Asset/AssetManager.js b/Asset/AssetManager.js
index 6f8f7e0..b91b2ba 100644
--- a/Asset/AssetManager.js
+++ b/Asset/AssetManager.js
@@ -153,7 +153,7 @@
      *
      * @since 1.0.0
      */
-    jsOMS.Asset.AssetManager.prototype.remove = function (key, isHashed)
+    jsOMS.Asset.AssetManager.prototype.remove = function (key)
     {
         key = jsOMS.hash(key);
 
diff --git a/Event/EventManager.js b/Event/EventManager.js
index 59ff8d2..269757e 100644
--- a/Event/EventManager.js
+++ b/Event/EventManager.js
@@ -100,6 +100,7 @@
      *
      * @param {string|int} group Group id
      * @param {string|int} id Event id
+     * @param {Object} [data] Data for event
      *
      * @return {boolean}
      *
@@ -112,7 +113,7 @@
         id = typeof id !== 'undefined' ? id : 0;
 
         if(!this.callbacks.hasOwnProperty(group)) {
-            return;
+            return false;
         }
 
         if (typeof this.groups[group] !== 'undefined') {
@@ -155,7 +156,7 @@
      * @param {boolean} remove Should be removed after execution
      * @param {boolean} reset Reset after triggering
      *
-     * @return {void}
+     * @return {boolean}
      *
      * @method
      *
diff --git a/Log/Logger.js b/Log/Logger.js
index 23208ca..eb74430 100644
--- a/Log/Logger.js
+++ b/Log/Logger.js
@@ -33,9 +33,9 @@
     /**
      * Get logging instance
      *
-     * @param {boolean} verbose Verbose logging
-     * @param {boolean} ui Ui logging
-     * @param {boolean} remote Remote logging
+     * @param {boolean} [verbose] Verbose logging
+     * @param {boolean} [ui] Ui logging
+     * @param {boolean} [remote] Remote logging
      * 
      * @return {Object}
      *
@@ -58,8 +58,8 @@
      * Interpolate message
      *
      * @param {string} message Message structure
-     * @param {Object} context Context to put into message
-     * @param {string} level Log level
+     * @param {Object} [context] Context to put into message
+     * @param {string} [level] Log level
      * 
      * @return {string}
      *
@@ -84,7 +84,7 @@
      * Create context
      *
      * @param {string} message Message to display
-     * @param {Object} context Context to put into message
+     * @param {Object} [context] Context to put into message
      * @param {string} level Log level
      * 
      * @return {Object}
@@ -110,7 +110,7 @@
      * Create log message
      *
      * @param {string} message Message to display
-     * @param {Object} context Context to put into message
+     * @param {Object} [context] Context to put into message
      * @param {string} level Log level
      * 
      * @return {void}
@@ -172,7 +172,7 @@
      * Create log message
      *
      * @param {string} message Message to display
-     * @param {Object} context Context to put into message
+     * @param {Object} [context] Context to put into message
      * 
      * @return {void}
      *
@@ -191,7 +191,7 @@
      * Create log message
      *
      * @param {string} message Message to display
-     * @param {Object} context Context to put into message
+     * @param {Object} [context] Context to put into message
      * 
      * @return {void}
      *
@@ -210,7 +210,7 @@
      * Create log message
      *
      * @param {string} message Message to display
-     * @param {Object} context Context to put into message
+     * @param {Object} [context] Context to put into message
      * 
      * @return {void}
      *
@@ -229,7 +229,7 @@
      * Create log message
      *
      * @param {string} message Message to display
-     * @param {Object} context Context to put into message
+     * @param {Object} [context] Context to put into message
      * 
      * @return {void}
      *
@@ -248,7 +248,7 @@
      * Create log message
      *
      * @param {string} message Message to display
-     * @param {Object} context Context to put into message
+     * @param {Object} [context] Context to put into message
      * 
      * @return {void}
      *
@@ -267,7 +267,7 @@
      * Create log message
      *
      * @param {string} message Message to display
-     * @param {Object} context Context to put into message
+     * @param {Object} [context] Context to put into message
      * 
      * @return {void}
      *
@@ -286,7 +286,7 @@
      * Create log message
      *
      * @param {string} message Message to display
-     * @param {Object} context Context to put into message
+     * @param {Object} [context] Context to put into message
      * 
      * @return {void}
      *
@@ -305,7 +305,7 @@
      * Create log message
      *
      * @param {string} message Message to display
-     * @param {Object} context Context to put into message
+     * @param {Object} [context] Context to put into message
      * 
      * @return {void}
      *
@@ -325,7 +325,7 @@
      *
      * @param {string} level Log level
      * @param {string} message Message to display
-     * @param {Object} context Context to put into message
+     * @param {Object} [context] Context to put into message
      * 
      * @return {void}
      *
@@ -343,8 +343,9 @@
     /**
      * Create log message
      *
+     * @param {string} level Log level
      * @param {string} message Message to display
-     * @param {Object} context Context to put into message
+     * @param {Object} [context] Context to put into message
      * 
      * @return {void}
      *
diff --git a/UI/ActionManager.js b/UI/ActionManager.js
index 1fb2d41..a531911 100644
--- a/UI/ActionManager.js
+++ b/UI/ActionManager.js
@@ -154,7 +154,9 @@
      * Run event action.
      *
      * @param {Element} e Button
+     * @param {Object} listener Listener
      * @param {Object} action Action
+     * @param {Object} data Data for the next action
      *
      * @return {void}
      *
diff --git a/Uri/Http.js b/Uri/Http.js
index e0a04de..17c5521 100644
--- a/Uri/Http.js
+++ b/Uri/Http.js
@@ -41,7 +41,7 @@
      * Parse uri
      *
      * @param {string} str Url to parse
-     * @param {string} mode Parsing mode
+     * @param {string} [mode] Parsing mode
      *
      * @return {Object}
      *
@@ -341,7 +341,7 @@
     /**
      * Get Uri path offset
      *
-     * @return {string}
+     * @return {int}
      *
      * @method
      *
diff --git a/Uri/UriFactory.js b/Uri/UriFactory.js
index cd3d763..c94932e 100644
--- a/Uri/UriFactory.js
+++ b/Uri/UriFactory.js
@@ -26,7 +26,7 @@
      *
      * @param {string} key Query key
      * @param {string} value Query value
-     * @param {boolean} overwrite Overwrite if already exists?
+     * @param {boolean} [overwrite] Overwrite if already exists?
      *
      * @return {boolean}
      *
@@ -52,7 +52,7 @@
      *
      * @param {string} key
      * 
-     * @return {string}|null
+     * @return {string}
      *
      * @method
      *
@@ -61,7 +61,7 @@
     jsOMS.Uri.UriFactory.getQuery = function (key)
     {
         if (!jsOMS.Uri.UriFactory.uri.hasOwnProperty(key)) {
-            return null;
+            return '';
         }
 
         return jsOMS.Uri.UriFactory.uri[key];
@@ -185,7 +185,7 @@
      * % = Current url
      *
      * @param {string} uri Raw uri
-     * @param {Object} toMatch Key/value pair to replace in raw
+     * @param {Object} [toMatch] Key/value pair to replace in raw
      *
      * @function
      *
diff --git a/Utils/ArrayUtils.js b/Utils/ArrayUtils.js
index efb09e0..c0988d8 100644
--- a/Utils/ArrayUtils.js
+++ b/Utils/ArrayUtils.js
@@ -16,7 +16,7 @@
      * Trim char from string
      *
      * @param {string} path Array path
-     * @param {obj} data Object
+     * @param {Object} data Object
      * @param {string} delim Path delimiter
      *
      * @return {mixed}
diff --git a/Utils/StringUtils.js b/Utils/StringUtils.js
index 4a619e2..caacf00 100644
--- a/Utils/StringUtils.js
+++ b/Utils/StringUtils.js
@@ -105,7 +105,7 @@
         }
         
         return n;
-    }
+    };
 
     /**
      * Integer hash
diff --git a/Utils/oLib.js b/Utils/oLib.js
index 12ffad0..9bd175b 100644
--- a/Utils/oLib.js
+++ b/Utils/oLib.js
@@ -16,7 +16,7 @@
      * Trim char from string
      *
      * @param {string} path Array path
-     * @param {obj} data Object
+     * @param {Object} data Object
      * @param {string} delim Path delimiter
      *
      * @return {mixed}
@@ -134,7 +134,7 @@
         }
         
         return n;
-    }
+    };
 
     /**
      * Class finder
diff --git a/Views/FormView.js b/Views/FormView.js
index 228b181..0a7470f 100644
--- a/Views/FormView.js
+++ b/Views/FormView.js
@@ -127,7 +127,7 @@
      */
     jsOMS.Views.FormView.prototype.getFormElements = function ()
     {
-        const form = document.getElementById(this.id)
+        const form = document.getElementById(this.id);
 
         if(!form) {
             return [];