diff --git a/Client/Tuning/main.js b/Client/Tuning/main.js
index 1517ebae..c1f57130 100644
--- a/Client/Tuning/main.js
+++ b/Client/Tuning/main.js
@@ -6,7 +6,7 @@
 
 var keyBound = false;
 
-var carModTypes = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 22, 23];
+var carModTypes = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18, 22, 23, 25, 27, 28, 30, 33, 34, 35, 38, 46, 48, 62];
 
 var carModSlotName = [
     { Slot: 0, Name: "Spoiler" },           // 0
@@ -119,6 +119,11 @@ mp.events.add("showTuningMenu", () => {
     var localPlayer = mp.players.local;
     var localVehicle = localPlayer.vehicle;
 
+    if (typeof mainMenu !== "undefined" && mainMenu.Visible) {
+        return;
+    }
+
+
     mainMenu = new Menu("Fahrzeugwerkstatt", "Modifiziere dein Fahrzeug", new Point(50, 50));
 
     carModTypes.forEach((modType) => {
@@ -130,6 +135,8 @@ mp.events.add("showTuningMenu", () => {
                 if (slotName === undefined) slotName = getSlotName(modType);
             }
 
+            if (slotName === "undefined") slotName = "Slot " + modType;
+
             var menuItem = new UIMenuItem(slotName);
 
             if(localVehicle.getNumMods(modType) !== 0) mainMenu.AddItem(menuItem);
@@ -141,6 +148,16 @@ mp.events.add("showTuningMenu", () => {
     mainMenu.ItemSelect.on(item => {
         var modSlot = getSlotId(item.Text);
 
+        mp.gui.chat.push(item.Text);
+
+        if (item.Text.startsWith("Slot")) {
+            mp.gui.chat.push("slot item");
+            restStr = item.Text.substring(5);
+            mp.gui.chat.push(`restStr = ${restStr}`);
+            modSlot = parseInt(restStr);
+            mp.gui.chat.push(`modSlot = ${modSlot}`);
+        }
+
         var modNum = localVehicle.getNumMods(modSlot);
 
         var modMenu = new Menu(item.Text, "Änderung: " + item.Text, new Point(50, 50));