diff --git a/dist/autoloader.js b/dist/autoloader.js
index cfae7fd..c666851 100755
--- a/dist/autoloader.js
+++ b/dist/autoloader.js
@@ -1,4 +1,4 @@
-/*Generated on:Sat Dec 01 2018 15:07:22 GMT+0100 (CET)*/
+/*Generated on:Sat Dec 01 2018 15:15:16 GMT+0100 (CET)*/
 var AutomaticDispose_Branch = "master";
 var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/";
 var da_lss_adis_time = new Date().getTime();
diff --git a/dist/autoloaderV2.js b/dist/autoloaderV2.js
index 3ca6b40..659e87a 100644
--- a/dist/autoloaderV2.js
+++ b/dist/autoloaderV2.js
@@ -1,4 +1,4 @@
-/*Generated on:Sat Dec 01 2018 15:07:22 GMT+0100 (CET)*/
+/*Generated on:Sat Dec 01 2018 15:15:16 GMT+0100 (CET)*/
 /*
  * Dexie.js - a minimalistic wrapper for IndexedDB
  * ===============================================
@@ -17102,10 +17102,10 @@ class AutomaticDispose {
             })
             return resolve();
         }).then(() => {
-            $("#building_list").find(".building_list_vehicle_element").each(() => {
-                var VehicleStatus = $(this).find(".building_list_fms").text();
-                var VehicleType = Number(parseInt($(this).find("a").attr("vehicle_type_id")));
-                var VehicleID = $(this).attr("vehicle_id");
+            $("#building_list").find(".building_list_vehicle_element").each((_,elem) => {
+                var VehicleStatus = $(elem).find(".building_list_fms").text();
+                var VehicleType = Number(parseInt($(elem).find("a").attr("vehicle_type_id")));
+                var VehicleID = $(elem).attr("vehicle_id");
                 if (VehicleStatus == "5" && [32, 52].indexOf(VehicleType) === -1) {
                     self.AddRescueSprechwunschToQueue(VehicleID);
                 }
@@ -17176,15 +17176,15 @@ class AutomaticDispose {
         let self = this;
         self.Hospitals = [];
         if ($("h4:contains('Eigene Krankenhäuser')").length > 0) {
-            $("h4:contains('Eigene Krankenhäuser')").next("table").find("tbody").find("tr").each(() => {
-                var HospitalHref = $(this).find("a:contains('Anfahren')").attr("href");
-                var HospitalID = Number(parseInt($(this).find("a:contains('Anfahren')").attr("id").replace("btn_approach_", "")));
-                var HospitalDistance = parseInt($(this).find("td").eq("1").text());
-                var HospitalFreeBeds = parseInt($(this).find("td").eq("2").text());
+            $("h4:contains('Eigene Krankenhäuser')").next("table").find("tbody").find("tr").each((_,elem) => {
+                var HospitalHref = $(elem).find("a:contains('Anfahren')").attr("href");
+                var HospitalID = Number(parseInt($(elem).find("a:contains('Anfahren')").attr("id").replace("btn_approach_", "")));
+                var HospitalDistance = parseInt($(elem).find("td").eq("1").text());
+                var HospitalFreeBeds = parseInt($(elem).find("td").eq("2").text());
 
                 var HospitalValue = HospitalDistance * 450 * -1;
                 HospitalValue += 2000; // Own Hospitals are better :-)
-                if ($(this).find(".label:contains('Ja')").length > 0) {
+                if ($(elem).find(".label:contains('Ja')").length > 0) {
                     HospitalValue += 2000;
                 }
 
@@ -17200,20 +17200,20 @@ class AutomaticDispose {
         }
 
         if ($("h4:contains('Verbandskrankenhäuser')").length > 0) {
-            $("h4:contains('Verbandskrankenhäuser')").next("table").find("tbody").find("tr").each(() => {
-                var HospitalHref = $(this).find("a").attr("href")
+            $("h4:contains('Verbandskrankenhäuser')").next("table").find("tbody").find("tr").each((_,elem) => {
+                var HospitalHref = $(elem).find("a").attr("href")
                 var HospitalID = Number(parseInt(HospitalHref.substr(HospitalHref.lastIndexOf("/") + 1)));
-                var HospitalDistance = parseInt($(this).find("td").eq("1").text());
-                var HospitalFreeBeds = parseInt($(this).find("td").eq("2").text());
-                var HospitalTaxes = parseInt($(this).find("td").eq("3").text());
+                var HospitalDistance = parseInt($(elem).find("td").eq("1").text());
+                var HospitalFreeBeds = parseInt($(elem).find("td").eq("2").text());
+                var HospitalTaxes = parseInt($(elem).find("td").eq("3").text());
                 var HospitalSpecialDepartment = false;
 
                 // Add Button-ID to Alliance-Hospital
-                $(this).find("a").attr("id", "btn_approach_" + HospitalID.toString());
+                $(elem).find("a").attr("id", "btn_approach_" + HospitalID.toString());
 
                 var HospitalValue = HospitalDistance * 450 * -1;
 
-                if ($(this).find(".label:contains('Ja')").length > 0) {
+                if ($(elem).find(".label:contains('Ja')").length > 0) {
                     HospitalSpecialDepartment = true;
                     HospitalValue += 2000;
                 }
@@ -17278,17 +17278,17 @@ class AutomaticDispose {
             return resolve();
         }).then(() => {
             var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible');
-            return MOIODOS.each(() => {
-                if ($(this).text().match(/Gefangene sollen abtransportiert werden/g)) {
-                    var MissionID = $(this).attr("mission_id");
+            return MOIODOS.each((_,elem) => {
+                if ($(elem).text().match(/Gefangene sollen abtransportiert werden/g)) {
+                    var MissionID = $(elem).attr("mission_id");
                     self.AddPoliceSprechwunschToQueue(MissionID);
                 }
             });
         }).then(() => {
-            $("#building_list").find(".building_list_vehicle_element").each(() => {
-                var VehicleStatus = $(this).find(".building_list_fms").text();
-                var VehicleType = Number(parseInt($(this).find("a").attr("vehicle_type_id")));
-                var VehicleID = $(this).attr("vehicle_id");
+            $("#building_list").find(".building_list_vehicle_element").each((_,elem) => {
+                var VehicleStatus = $(elem).find(".building_list_fms").text();
+                var VehicleType = Number(parseInt($(elem).find("a").attr("vehicle_type_id")));
+                var VehicleID = $(elem).attr("vehicle_id");
                 if (VehicleStatus == "5" && [32, 52].indexOf(VehicleType) !== -1) {
                     var map2 = $('#radio_messages_important > li.radio_message_vehicle_' + VehicleID + ' a:contains("Zum Einsatz")');
                     if (map2.length > 0) {
@@ -17370,10 +17370,10 @@ class AutomaticDispose {
         var GefKwGefaegnisse = $(GefKw[0]).parent().parent().next('tr');
         var FuStWGefaegnisse = $(FuStW[0]).parent().parent().next('tr');
 
-        GefKwGefaegnisse.find("a:contains('Freie Zellen')").each(() => {
-            var JailHref = $(this).attr("href");
+        GefKwGefaegnisse.find("a:contains('Freie Zellen')").each((_,elem) => {
+            var JailHref = $(elem).attr("href");
             var JailID = JailHref.split("/").pop();
-            var JailText = $(this).text();
+            var JailText = $(elem).text();
             var JailFreeBeds = 0;
             var JailDistance = 0;
             var JailTax = 0;
@@ -17435,10 +17435,10 @@ class AutomaticDispose {
                 });
             }
         });
-        FuStWGefaegnisse.find("a:contains('Freie Zellen')").each(() => {
-            var JailHref = $(this).attr("href");
+        FuStWGefaegnisse.find("a:contains('Freie Zellen')").each((_,elem) => {
+            var JailHref = $(elem).attr("href");
             var JailID = JailHref.split("/").pop();
-            var JailText = $(this).text();
+            var JailText = $(elem).text();
             var JailFreeBeds = 0;
             var JailDistance = 0;
             var JailTax = 0;
@@ -17508,8 +17508,8 @@ class AutomaticDispose {
         if (self.Jails.length > 0) {
             this.Send_Vehicle_To_Jail()
         } else {
-            $("#mission_vehicle_driving tbody, #mission_vehicle_at_mission tbody").find("tr").each(() => {
-                var CalledVehicleID = parseInt($(this).find("a").first().attr("vehicle_type_id"));
+            $("#mission_vehicle_driving tbody, #mission_vehicle_at_mission tbody").find("tr").each((_,elem) => {
+                var CalledVehicleID = parseInt($(elem).find("a").first().attr("vehicle_type_id"));
                 if (CalledVehicleID == 52) {
                     CountGefangene -= 5;
                 } else if (CalledVehicleID == 32) {
@@ -17518,17 +17518,17 @@ class AutomaticDispose {
             });
 
             if ($('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').size() > 0 && CountGefangene >= 5) {
-                $('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').each(() => {
+                $('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').each((_,elem) => {
                     if (CountGefangene > 0) {
-                        $(this).click()
+                        $(elem).click()
                         CountGefangene -= 5;
                     }
                 });
             }
             if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').size() > 0 && CountGefangene > 0) {
-                $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').each(() => {
+                $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').each((_,elem) => {
                     if (CountGefangene > 0) {
-                        $(this).click()
+                        $(elem).click()
                         CountGefangene -= 1;
                     }
                 });
@@ -17768,8 +17768,8 @@ class AutomaticDispose {
         //      Click Events
         //
 
-        $("#adis-setting-krankentransport-automatic").click(() => {
-            var tf = $(this).hasClass("active");
+        $("#adis-setting-krankentransport-automatic").click((e) => {
+            var tf = $(e.target).hasClass("active");
             self.ADisDB.ADisSettings.put({
                 name: "Krankentransport-Automatic",
                 value: !tf ? 'true' : 'false'
@@ -17778,8 +17778,8 @@ class AutomaticDispose {
             });
         });
 
-        $("#adis-setting-full-automatic").click(() => {
-            var tf = $(this).hasClass("active");
+        $("#adis-setting-full-automatic").click((e) => {
+            var tf = $(e.target).hasClass("active");
             self.ADisDB.ADisSettings.put({
                 name: "MissionsOwn-Automatic",
                 value: !tf ? 'true' : 'false'
@@ -17788,8 +17788,8 @@ class AutomaticDispose {
             });
         });
 
-        $("#adis-setting-sprechwunsch-automatic").click(() => {
-            var tf = $(this).hasClass("active");
+        $("#adis-setting-sprechwunsch-automatic").click((e) => {
+            var tf = $(e.target).hasClass("active");
             self.ADisDB.ADisSettings.put({
                 name: "Sprechwunsch-Automatic",
                 value: !tf ? 'true' : 'false'
@@ -17798,8 +17798,8 @@ class AutomaticDispose {
             });
         });
 
-        $("#adis-setting-alliance-automatic").click(() => {
-            var tf = $(this).hasClass("active");
+        $("#adis-setting-alliance-automatic").click((e) => {
+            var tf = $(e.target).hasClass("active");
             self.ADisDB.ADisSettings.put({
                 name: "Alliance-Automatic",
                 value: !tf ? 'true' : 'false'
@@ -17808,8 +17808,8 @@ class AutomaticDispose {
             });
         });
 
-        $("#adis-setting-alliance-automatic").click(() => {
-            var tf = $(this).hasClass("active");
+        $("#adis-setting-alliance-automatic").click((e) => {
+            var tf = $(e.target).hasClass("active");
             self.ADisDB.ADisSettings.put({
                 name: "AllianceEvent-Automatic",
                 value: !tf ? 'true' : 'false'
@@ -17831,8 +17831,8 @@ class AutomaticDispose {
         $("#adis-dashboard-close-button").click(() => {
             $("#adis-dashboard").animate({
                 opacity: 0
-            }, 200, () => {
-                $(this).css("display", "none");
+            }, 200, (e) => {
+                $(e.target).css("display", "none");
             });
         });
 
diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js
index 62507d5..9bb4dcd 100644
--- a/src/autoloaderV2.js
+++ b/src/autoloaderV2.js
@@ -209,10 +209,10 @@ class AutomaticDispose {
             })
             return resolve();
         }).then(() => {
-            $("#building_list").find(".building_list_vehicle_element").each(() => {
-                var VehicleStatus = $(this).find(".building_list_fms").text();
-                var VehicleType = Number(parseInt($(this).find("a").attr("vehicle_type_id")));
-                var VehicleID = $(this).attr("vehicle_id");
+            $("#building_list").find(".building_list_vehicle_element").each((_,elem) => {
+                var VehicleStatus = $(elem).find(".building_list_fms").text();
+                var VehicleType = Number(parseInt($(elem).find("a").attr("vehicle_type_id")));
+                var VehicleID = $(elem).attr("vehicle_id");
                 if (VehicleStatus == "5" && [32, 52].indexOf(VehicleType) === -1) {
                     self.AddRescueSprechwunschToQueue(VehicleID);
                 }
@@ -283,15 +283,15 @@ class AutomaticDispose {
         let self = this;
         self.Hospitals = [];
         if ($("h4:contains('Eigene Krankenhäuser')").length > 0) {
-            $("h4:contains('Eigene Krankenhäuser')").next("table").find("tbody").find("tr").each(() => {
-                var HospitalHref = $(this).find("a:contains('Anfahren')").attr("href");
-                var HospitalID = Number(parseInt($(this).find("a:contains('Anfahren')").attr("id").replace("btn_approach_", "")));
-                var HospitalDistance = parseInt($(this).find("td").eq("1").text());
-                var HospitalFreeBeds = parseInt($(this).find("td").eq("2").text());
+            $("h4:contains('Eigene Krankenhäuser')").next("table").find("tbody").find("tr").each((_,elem) => {
+                var HospitalHref = $(elem).find("a:contains('Anfahren')").attr("href");
+                var HospitalID = Number(parseInt($(elem).find("a:contains('Anfahren')").attr("id").replace("btn_approach_", "")));
+                var HospitalDistance = parseInt($(elem).find("td").eq("1").text());
+                var HospitalFreeBeds = parseInt($(elem).find("td").eq("2").text());
 
                 var HospitalValue = HospitalDistance * 450 * -1;
                 HospitalValue += 2000; // Own Hospitals are better :-)
-                if ($(this).find(".label:contains('Ja')").length > 0) {
+                if ($(elem).find(".label:contains('Ja')").length > 0) {
                     HospitalValue += 2000;
                 }
 
@@ -307,20 +307,20 @@ class AutomaticDispose {
         }
 
         if ($("h4:contains('Verbandskrankenhäuser')").length > 0) {
-            $("h4:contains('Verbandskrankenhäuser')").next("table").find("tbody").find("tr").each(() => {
-                var HospitalHref = $(this).find("a").attr("href")
+            $("h4:contains('Verbandskrankenhäuser')").next("table").find("tbody").find("tr").each((_,elem) => {
+                var HospitalHref = $(elem).find("a").attr("href")
                 var HospitalID = Number(parseInt(HospitalHref.substr(HospitalHref.lastIndexOf("/") + 1)));
-                var HospitalDistance = parseInt($(this).find("td").eq("1").text());
-                var HospitalFreeBeds = parseInt($(this).find("td").eq("2").text());
-                var HospitalTaxes = parseInt($(this).find("td").eq("3").text());
+                var HospitalDistance = parseInt($(elem).find("td").eq("1").text());
+                var HospitalFreeBeds = parseInt($(elem).find("td").eq("2").text());
+                var HospitalTaxes = parseInt($(elem).find("td").eq("3").text());
                 var HospitalSpecialDepartment = false;
 
                 // Add Button-ID to Alliance-Hospital
-                $(this).find("a").attr("id", "btn_approach_" + HospitalID.toString());
+                $(elem).find("a").attr("id", "btn_approach_" + HospitalID.toString());
 
                 var HospitalValue = HospitalDistance * 450 * -1;
 
-                if ($(this).find(".label:contains('Ja')").length > 0) {
+                if ($(elem).find(".label:contains('Ja')").length > 0) {
                     HospitalSpecialDepartment = true;
                     HospitalValue += 2000;
                 }
@@ -385,17 +385,17 @@ class AutomaticDispose {
             return resolve();
         }).then(() => {
             var MOIODOS = $('div#mission_list div.missionSideBarEntry:visible');
-            return MOIODOS.each(() => {
-                if ($(this).text().match(/Gefangene sollen abtransportiert werden/g)) {
-                    var MissionID = $(this).attr("mission_id");
+            return MOIODOS.each((_,elem) => {
+                if ($(elem).text().match(/Gefangene sollen abtransportiert werden/g)) {
+                    var MissionID = $(elem).attr("mission_id");
                     self.AddPoliceSprechwunschToQueue(MissionID);
                 }
             });
         }).then(() => {
-            $("#building_list").find(".building_list_vehicle_element").each(() => {
-                var VehicleStatus = $(this).find(".building_list_fms").text();
-                var VehicleType = Number(parseInt($(this).find("a").attr("vehicle_type_id")));
-                var VehicleID = $(this).attr("vehicle_id");
+            $("#building_list").find(".building_list_vehicle_element").each((_,elem) => {
+                var VehicleStatus = $(elem).find(".building_list_fms").text();
+                var VehicleType = Number(parseInt($(elem).find("a").attr("vehicle_type_id")));
+                var VehicleID = $(elem).attr("vehicle_id");
                 if (VehicleStatus == "5" && [32, 52].indexOf(VehicleType) !== -1) {
                     var map2 = $('#radio_messages_important > li.radio_message_vehicle_' + VehicleID + ' a:contains("Zum Einsatz")');
                     if (map2.length > 0) {
@@ -477,10 +477,10 @@ class AutomaticDispose {
         var GefKwGefaegnisse = $(GefKw[0]).parent().parent().next('tr');
         var FuStWGefaegnisse = $(FuStW[0]).parent().parent().next('tr');
 
-        GefKwGefaegnisse.find("a:contains('Freie Zellen')").each(() => {
-            var JailHref = $(this).attr("href");
+        GefKwGefaegnisse.find("a:contains('Freie Zellen')").each((_,elem) => {
+            var JailHref = $(elem).attr("href");
             var JailID = JailHref.split("/").pop();
-            var JailText = $(this).text();
+            var JailText = $(elem).text();
             var JailFreeBeds = 0;
             var JailDistance = 0;
             var JailTax = 0;
@@ -542,10 +542,10 @@ class AutomaticDispose {
                 });
             }
         });
-        FuStWGefaegnisse.find("a:contains('Freie Zellen')").each(() => {
-            var JailHref = $(this).attr("href");
+        FuStWGefaegnisse.find("a:contains('Freie Zellen')").each((_,elem) => {
+            var JailHref = $(elem).attr("href");
             var JailID = JailHref.split("/").pop();
-            var JailText = $(this).text();
+            var JailText = $(elem).text();
             var JailFreeBeds = 0;
             var JailDistance = 0;
             var JailTax = 0;
@@ -615,8 +615,8 @@ class AutomaticDispose {
         if (self.Jails.length > 0) {
             this.Send_Vehicle_To_Jail()
         } else {
-            $("#mission_vehicle_driving tbody, #mission_vehicle_at_mission tbody").find("tr").each(() => {
-                var CalledVehicleID = parseInt($(this).find("a").first().attr("vehicle_type_id"));
+            $("#mission_vehicle_driving tbody, #mission_vehicle_at_mission tbody").find("tr").each((_,elem) => {
+                var CalledVehicleID = parseInt($(elem).find("a").first().attr("vehicle_type_id"));
                 if (CalledVehicleID == 52) {
                     CountGefangene -= 5;
                 } else if (CalledVehicleID == 32) {
@@ -625,17 +625,17 @@ class AutomaticDispose {
             });
 
             if ($('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').size() > 0 && CountGefangene >= 5) {
-                $('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').each(() => {
+                $('#vehicle_show_table_all tr[vehicle_type="GefKw"] input[type="checkbox"]').each((_,elem) => {
                     if (CountGefangene > 0) {
-                        $(this).click()
+                        $(elem).click()
                         CountGefangene -= 5;
                     }
                 });
             }
             if ($('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').size() > 0 && CountGefangene > 0) {
-                $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').each(() => {
+                $('#vehicle_show_table_all tr[vehicle_type="FuStW"] input[type="checkbox"]').each((_,elem) => {
                     if (CountGefangene > 0) {
-                        $(this).click()
+                        $(elem).click()
                         CountGefangene -= 1;
                     }
                 });
@@ -695,8 +695,8 @@ class AutomaticDispose {
         //      Click Events
         //
 
-        $("#adis-setting-krankentransport-automatic").click(() => {
-            var tf = $(this).hasClass("active");
+        $("#adis-setting-krankentransport-automatic").click((e) => {
+            var tf = $(e.target).hasClass("active");
             self.ADisDB.ADisSettings.put({
                 name: "Krankentransport-Automatic",
                 value: !tf ? 'true' : 'false'
@@ -705,8 +705,8 @@ class AutomaticDispose {
             });
         });
 
-        $("#adis-setting-full-automatic").click(() => {
-            var tf = $(this).hasClass("active");
+        $("#adis-setting-full-automatic").click((e) => {
+            var tf = $(e.target).hasClass("active");
             self.ADisDB.ADisSettings.put({
                 name: "MissionsOwn-Automatic",
                 value: !tf ? 'true' : 'false'
@@ -715,8 +715,8 @@ class AutomaticDispose {
             });
         });
 
-        $("#adis-setting-sprechwunsch-automatic").click(() => {
-            var tf = $(this).hasClass("active");
+        $("#adis-setting-sprechwunsch-automatic").click((e) => {
+            var tf = $(e.target).hasClass("active");
             self.ADisDB.ADisSettings.put({
                 name: "Sprechwunsch-Automatic",
                 value: !tf ? 'true' : 'false'
@@ -725,8 +725,8 @@ class AutomaticDispose {
             });
         });
 
-        $("#adis-setting-alliance-automatic").click(() => {
-            var tf = $(this).hasClass("active");
+        $("#adis-setting-alliance-automatic").click((e) => {
+            var tf = $(e.target).hasClass("active");
             self.ADisDB.ADisSettings.put({
                 name: "Alliance-Automatic",
                 value: !tf ? 'true' : 'false'
@@ -735,8 +735,8 @@ class AutomaticDispose {
             });
         });
 
-        $("#adis-setting-alliance-automatic").click(() => {
-            var tf = $(this).hasClass("active");
+        $("#adis-setting-alliance-automatic").click((e) => {
+            var tf = $(e.target).hasClass("active");
             self.ADisDB.ADisSettings.put({
                 name: "AllianceEvent-Automatic",
                 value: !tf ? 'true' : 'false'
@@ -758,8 +758,8 @@ class AutomaticDispose {
         $("#adis-dashboard-close-button").click(() => {
             $("#adis-dashboard").animate({
                 opacity: 0
-            }, 200, () => {
-                $(this).css("display", "none");
+            }, 200, (e) => {
+                $(e.target).css("display", "none");
             });
         });