diff --git a/ReallifeGamemode.Client/Player/weaponlist.ts b/ReallifeGamemode.Client/Player/weaponlist.ts
index 8b432c41..3e31319d 100644
--- a/ReallifeGamemode.Client/Player/weaponlist.ts
+++ b/ReallifeGamemode.Client/Player/weaponlist.ts
@@ -62,7 +62,6 @@ export default function weaponList(globalData: GlobalData) {
                             primary = "";
                         } else {
                             primary = String(item.SelectedItem.DisplayText);
-                            mp.events.callRemote("updateWeaponSelection", primary, 1);
                         }
                         break;
                     case "Sekundäre":
@@ -70,7 +69,6 @@ export default function weaponList(globalData: GlobalData) {
                             secondary = "";
                         } else {
                             secondary = String(item.SelectedItem.DisplayText);
-                            mp.events.callRemote("updateWeaponSelection", secondary, 2);
                         }
                         break;
                     case "Nahkampf":
@@ -78,7 +76,6 @@ export default function weaponList(globalData: GlobalData) {
                             melee = "";
                         } else {
                             melee = String(item.SelectedItem.DisplayText);
-                            mp.events.callRemote("updateWeaponSelection", melee, 3);
                         }
                         break;
                     case "Spezial":
@@ -86,7 +83,6 @@ export default function weaponList(globalData: GlobalData) {
                             specialWep = "";
                         } else {
                             specialWep = String(item.SelectedItem.DisplayText);
-                            mp.events.callRemote("updateWeaponSelection", specialWep, 4);
                         }
                         break;
                 }
diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs
index 86d555c7..ca5a9f96 100644
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -206,7 +206,7 @@ namespace ReallifeGamemode.Server.Events
             player.SendNotification("Du bist nun ~r~außer Dienst.");
             NAPI.ClientEvent.TriggerClientEventForAll("updateDutyMedics", false);
             player.NametagColor = new Color(255, 255, 255);
-            player.SetSharedData("blipColor", 4);
+            player.SetSharedData("blipColor", 0);
             UpdateCharacterCloth.LoadCharacterDefaults(player);
           }
         }
@@ -259,7 +259,6 @@ namespace ReallifeGamemode.Server.Events
           foreach (Client target in NAPI.Pools.GetAllPlayers())
           {
             User c = target.GetUser();
-
             if (c.JailTime > 0)
             {
               criminals.Add(c.Name);
@@ -324,7 +323,6 @@ namespace ReallifeGamemode.Server.Events
                 }
                 continue;
               }
-
               switch (cloth.SlotId)
               {
                 case 11:
diff --git a/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs b/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs
index 45984261..33680a5b 100644
--- a/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs
+++ b/ReallifeGamemode.Server/Events/UpdateCharacterWeapon.cs
@@ -32,7 +32,6 @@ namespace ReallifeGamemode.Server.Events
       {
         client.RemoveAllWeapons();
         client.GiveWeapon(weaponHash, 0);
-
       }
       if (slot == 2)
       {
diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
index 0fff19ab..98c3297e 100644
--- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs
+++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
@@ -122,8 +122,7 @@ namespace ReallifeGamemode.Server.Extensions
           ChatService.SendMessage(copPlayer, "~r~HQ: " + user.Name + " hat eine Straftat begangen. Grund: " + reason + ".");
           ChatService.SendMessage(copPlayer, "~r~HQ: Der Straftäter: " + user.Name + " wird nun mit Fahndungslevel " + newWanteds + " gesucht.");
         }
-      }
-      
+      }      
     }
     public static FactionRank GetFactionRank(this User user)
     {
diff --git a/ReallifeGamemode.Server/Managers/PositionManager.cs b/ReallifeGamemode.Server/Managers/PositionManager.cs
index 87569e45..6167e508 100644
--- a/ReallifeGamemode.Server/Managers/PositionManager.cs
+++ b/ReallifeGamemode.Server/Managers/PositionManager.cs
@@ -27,8 +27,19 @@ namespace ReallifeGamemode.Server.Managers
         Position = new Vector3(458.24, -990.86, 30.68),
         FactionId = 1
       };
+      DutyPoint dutyPointFIB = new DutyPoint()
+      {
+        Position = new Vector3(109.5706, -745.2126, 242.1521),
+        FactionId = 1
+      };
+      DutyPoint dutyPointLSED = new DutyPoint()
+      {
+        Position = new Vector3(1152.181, -1527.95, 34.8434),
+        FactionId = 1
+      };
 
       DutyPoints.Add(dutyPointLSPD);
+      DutyPoints.Add(dutyPointFIB);
 
       foreach (DutyPoint d in DutyPoints)
       {
@@ -43,10 +54,28 @@ namespace ReallifeGamemode.Server.Managers
         Position = new Vector3(460.3162,-981.0168,30.68959),
         FactionId = 1
       };
+      WeaponPoint weaponPointFIB = new WeaponPoint()
+      {
+        Position = new Vector3(119.6835, -729.3273, 242.1519),
+        FactionId = 1
+      };
+      WeaponPoint weaponPointBallas = new WeaponPoint()
+      {
+        Position = new Vector3(1266.622, -1714.637, 54.65503),
+        FactionId = 8
+      };
+      WeaponPoint weaponPointGrove = new WeaponPoint()
+      {
+        Position = new Vector3(129.8998, -1938.709, 20.61865),
+        FactionId = 7
+      };
 
       WeaponPoints.Add(weaponPointLSPD);
+      WeaponPoints.Add(weaponPointFIB);
+      WeaponPoints.Add(weaponPointBallas);
+      WeaponPoints.Add(weaponPointGrove);
 
-      foreach(WeaponPoint w in WeaponPoints)
+      foreach (WeaponPoint w in WeaponPoints)
       {
         NAPI.Marker.CreateMarker(1, new Vector3(w.Position.X, w.Position.Y, w.Position.Z - 2), new Vector3(w.Position.X, w.Position.Y, w.Position.Z + 1),
            new Vector3(0, 0, 0), 2, new Color(255, 255, 255, 50), false, 0);
@@ -68,7 +97,6 @@ namespace ReallifeGamemode.Server.Managers
         NAPI.TextLabel.CreateTextLabel("Gefängnis PC - Dr\u00fccke ~y~E", j.Position, 7, 1, 0, new Color(255, 255, 255), false, 0);
       }
       #endregion
-
     }
   }
 
diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs
index cacacdcb..78659290 100644
--- a/ReallifeGamemode.Server/Wanted/Jail.cs
+++ b/ReallifeGamemode.Server/Wanted/Jail.cs
@@ -21,7 +21,7 @@ namespace ReallifeGamemode.Server.Wanted
       User user = client.GetUser();
       if (user.JailTime > 0)
       {
-        client.SetSharedData("blipColor", 4);
+        client.SetSharedData("blipColor", 0);
         client.RemoveAllWeapons();
         client.Health = 100;
         client.Armor = 0;
@@ -61,6 +61,7 @@ namespace ReallifeGamemode.Server.Wanted
             }
             client.SetData("isDead", false);
             client.RemoveAllWeapons();
+            client.SetSharedData("blipColor", 0);
             Random rnd = new Random();
             int rndInt = rnd.Next(1, 3);
             if (rndInt == 1)