diff --git a/js/class.js b/js/class.js
index 947ffb35..8cde84dd 100644
--- a/js/class.js
+++ b/js/class.js
@@ -21,7 +21,7 @@
 		var prototype = new this();
 		initializing = false;
 
-		// Make a copy of all prototype properies, to prevent reference issues.
+		// Make a copy of all prototype properties, to prevent reference issues.
 		for (var name in prototype) {
 			prototype[name] = cloneObject(prototype[name]);
 		}
diff --git a/js/loader.js b/js/loader.js
index 98db1c25..3a4e05c3 100644
--- a/js/loader.js
+++ b/js/loader.js
@@ -8,7 +8,7 @@
 
 var Loader = (function() {
 
-	/* Create helper valiables */
+	/* Create helper variables */
 
 	var loadedModuleFiles = [];
 	var loadedFiles = [];
@@ -55,7 +55,7 @@ var Loader = (function() {
 			module.start();
 		}
 
-		// Notifiy core of loded modules.
+		// Notify core of loaded modules.
 		MM.modulesStarted(moduleObjects);
 	};
 
@@ -104,7 +104,6 @@ var Loader = (function() {
 				config: moduleData.config,
 				classes: (typeof moduleData.classes !== "undefined") ? moduleData.classes + " " + module : module
 			});
-
 		}
 
 		return moduleFiles;
@@ -138,7 +137,6 @@ var Loader = (function() {
 				afterLoad();
 			});
 		}
-
 	};
 
 	/* bootstrapModule(module, mObj)
@@ -164,7 +162,6 @@ var Loader = (function() {
 				});
 			});
 		});
-
 	};
 
 	/* loadFile(fileName)
@@ -210,7 +207,6 @@ var Loader = (function() {
 			document.getElementsByTagName("head")[0].appendChild(stylesheet);
 			break;
 		}
-
 	};
 
 	/* Public Methods */
@@ -261,5 +257,4 @@ var Loader = (function() {
 			loadFile(module.file(fileName), callback);
 		}
 	};
-
 })();
diff --git a/modules/default/weather/weatherprovider.js b/modules/default/weather/weatherprovider.js
index 34654453..b24fff2f 100644
--- a/modules/default/weather/weatherprovider.js
+++ b/modules/default/weather/weatherprovider.js
@@ -23,15 +23,14 @@ var WeatherProvider = Class.extend({
 	weatherForecastArray: null,
 	fetchedLocationName: null,
 
-	// The following properties will be set automaticly.
+	// The following properties will be set automatically.
 	// You do not need to overwrite these properties.
 	config: null,
 	delegate: null,
 	providerIdentifier: null,
 
-
 	// Weather Provider Methods
-	// All the following methods can be overwrited, although most are good as they are.
+	// All the following methods can be overwritten, although most are good as they are.
 
 	// Called when a weather provider is initialized.
 	init: function(config) {
@@ -51,13 +50,13 @@ var WeatherProvider = Class.extend({
 	},
 
 	// This method should start the API request to fetch the current weather.
-	// This method should definetly be overwritten in the provider.
+	// This method should definitely be overwritten in the provider.
 	fetchCurrentWeather: function() {
 		Log.warn(`Weather provider: ${this.providerName} does not subclass the fetchCurrentWeather method.`);
 	},
 
 	// This method should start the API request to fetch the weather forecast.
-	// This method should definetly be overwritten in the provider.
+	// This method should definitely be overwritten in the provider.
 	fetchWeatherForecast: function() {
 		Log.warn(`Weather provider: ${this.providerName} does not subclass the fetchWeatherForecast method.`);
 	},
@@ -103,7 +102,7 @@ var WeatherProvider = Class.extend({
 		this.delegate.updateAvailable(this);
 	},
 
-	// A convinience function to make requests. It returns a promise.
+	// A convenience function to make requests. It returns a promise.
 	fetchData: function(url, method = "GET", data = null) {
 		return new Promise(function(resolve, reject) {
 			var request = new XMLHttpRequest();
diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js
index a59258ab..89f34a6b 100644
--- a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -82,7 +82,7 @@ Module.register("weatherforecast",{
 	getTranslations: function() {
 		// The translations for the default modules are defined in the core translation files.
 		// Therefor we can just return false. Otherwise we should have returned a dictionary.
-		// If you're trying to build yiur own module including translations, check out the documentation.
+		// If you're trying to build your own module including translations, check out the documentation.
 		return false;
 	},
 
@@ -240,7 +240,7 @@ Module.register("weatherforecast",{
 
 	/* updateWeather(compliments)
 	 * Requests new data from openweather.org.
-	 * Calls processWeather on succesfull response.
+	 * Calls processWeather on successful response.
 	 */
 	updateWeather: function() {
 		if (this.config.appid === "") {
diff --git a/tests/e2e/modules/calendar_spec.js b/tests/e2e/modules/calendar_spec.js
index 1685f7f0..beeba148 100644
--- a/tests/e2e/modules/calendar_spec.js
+++ b/tests/e2e/modules/calendar_spec.js
@@ -68,7 +68,7 @@ describe("Calendar module", function() {
 		});
 	});
 
-	describe("Basic auth backward compatibilty configuration: DEPRECATED", function() {
+	describe("Basic auth backward compatibility configuration: DEPRECATED", function() {
 		before(function() {
 			serverBasicAuth.listen(8012);
 			// Set config sample for use in test
diff --git a/tests/servers/basic-auth.js b/tests/servers/basic-auth.js
index 556412a8..067a000b 100644
--- a/tests/servers/basic-auth.js
+++ b/tests/servers/basic-auth.js
@@ -16,7 +16,7 @@ var basic = auth.basic(
 
 app.use(auth.connect(basic));
 
-// Set directories availables
+// Set available directories
 var directories = ["/tests/configs"];
 var directory;
 rootPath = path.resolve(__dirname + "/../../");