diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs
index 45a00fcf..e7312df1 100644
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -393,7 +393,7 @@ namespace ReallifeGamemode.Server.Events
                 }
 
                 weapon.Ammount += item.Amount;
-                ChatService.SendMessage(player, item.Amount + " " + iItem.Name + " wurden im Waffenlager hinzugefügt.");
+                ChatService.SendMessage(player, $"~y~[WT] ~s~Du hast eine ~y~Kiste abgeladen ~s~(Inhalt: {item.Amount}x {iItem.Name}).");
                 unloadedWeaponPackage = true;
                 context.Remove(item);
               }
diff --git a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs
index fe7af038..2d430b6a 100644
--- a/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs
+++ b/ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs
@@ -122,35 +122,18 @@ namespace ReallifeGamemode.Server.WeaponDeal
           msg = "Die Waffenlieferung steht zur Abholung bereit";
         }
 
-        ChatService.BroadcastFaction($"~y~[WAFFENDEAL]~s~ {msg}.", user.Faction);
+        ChatService.BroadcastFaction($"~y~[WT]~s~ {msg}.", user.Faction);
 
-        ChatService.SendMessage(client, "~y~[WAFFENDEAL]~s~ Steige in den ~y~Transporter ~s~ein und fahre zum Übergabepunkt.");
+        ChatService.SendMessage(client, "~y~[WT]~s~ Steig in den ~y~Transporter ~s~ein und fahre zum Übergabepunkt.");
         fVeh.SetData("weaponDeal", true);
         InventoryManager.RemoveAllItemsfromVehicleInventory(fVeh);
         Faction fac = context.Factions.Where(f => f.Id == user.FactionId).FirstOrDefault();
 
-        if (fac.Id == 1 | fac.Id == 3)
-        {
-          fac.WeaponDealTime = 180;
+        fac.WeaponDealTime = (fac.Id == 1 | fac.Id == 3) ? 180 : 60;
           context.SaveChanges();
-        }
-        else
-        {
-          fac.WeaponDealTime = 60;
-          context.SaveChanges();
-        }
       }
     }
 
-    /*
-    public static void WeaponDealTimer()
-    {
-      System.Timers.Timer timer = new System.Timers.Timer(60000);
-      timer.Start();
-      timer.Elapsed += Timer_Elapsed;
-    }
-    */
-
     public static void Timer_Elapsed()
     {
       using (var context = new DatabaseContext())
@@ -254,8 +237,8 @@ namespace ReallifeGamemode.Server.WeaponDeal
           InventoryManager.AddItemToVehicleInventory(fVeh, item7.ItemId, item7.Amount);
         }
 
-        ChatService.BroadcastFaction("~y~[WAFFENDEAL] ~w~Der Transporter wurde erfolgreich beladen.", new List<int>() { client.GetUser().Faction.Id });
-        client.SendChatMessage("~y~[WAFFENDEAL] ~w~Fahre nun zu deiner Base zurück.");
+        ChatService.BroadcastFaction("~y~[WT] ~w~Der Transporter wurde erfolgreich beladen.", new List<int>() { client.GetUser().Faction.Id });
+        client.SendChatMessage("~y~[WT] ~w~Fahre nun zu deiner Base zurück.");
         BasePoints basePoints = new BasePoints();
         basePoints.getbase(user.FactionId, client);
       }