diff --git a/ReallifeGamemode.Client/Gui/nametags.ts b/ReallifeGamemode.Client/Gui/nametags.ts
index 30ab2b05..9f434607 100644
--- a/ReallifeGamemode.Client/Gui/nametags.ts
+++ b/ReallifeGamemode.Client/Gui/nametags.ts
@@ -2,7 +2,7 @@
 import game from "..";
 
 
-const maxDistance = 25 * 25;
+const maxDistance = 40 * 40;
 const width = 0.03;
 const height = 0.0065;
 const border = 0.001;
diff --git a/ReallifeGamemode.Client/core/rage-mp/entities.ts b/ReallifeGamemode.Client/core/rage-mp/entities.ts
index 61e522d8..df59090c 100644
--- a/ReallifeGamemode.Client/core/rage-mp/entities.ts
+++ b/ReallifeGamemode.Client/core/rage-mp/entities.ts
@@ -73,7 +73,6 @@ class RagePlayer extends RageEntity implements IPlayer {
 
     get nametagColor(): number {
         var color = this.player.getVariable("nameTagColor");
-        game.ui.sendChatMessage(`player = ${this.player.name} - color = ${color}`);
         if (!color)
             return 0;
         return color;
diff --git a/ReallifeGamemode.Client/core/rage-mp/game.ts b/ReallifeGamemode.Client/core/rage-mp/game.ts
index 5094ba9f..62c9661a 100644
--- a/ReallifeGamemode.Client/core/rage-mp/game.ts
+++ b/ReallifeGamemode.Client/core/rage-mp/game.ts
@@ -11,7 +11,7 @@ export default class RageGame implements IGame {
     ui: IUi = new RageUi;
 
     wait(ms: number): void {
-        mp.game.wait(ms);
+        mp.game.waitAsync(ms);
     }
 
     disableDefaultEngineBehaviour(): void {
diff --git a/ReallifeGamemode.Client/inputhelper/index.ts b/ReallifeGamemode.Client/inputhelper/index.ts
index ce216572..5898bd5c 100644
--- a/ReallifeGamemode.Client/inputhelper/index.ts
+++ b/ReallifeGamemode.Client/inputhelper/index.ts
@@ -69,7 +69,7 @@ export default class InputHelper {
     private valueGetter(): Promise<string> {
         return new Promise(resolve => {
             while (this.value === undefined) {
-                mp.game.wait(1);
+                mp.game.waitAsync(1);
             }
             resolve(this.value);
         });
diff --git a/ReallifeGamemode.Server.Core/Commands/Command.cs b/ReallifeGamemode.Server.Core/Commands/Command.cs
index 92966605..ecb91b54 100644
--- a/ReallifeGamemode.Server.Core/Commands/Command.cs
+++ b/ReallifeGamemode.Server.Core/Commands/Command.cs
@@ -23,6 +23,6 @@ namespace ReallifeGamemode.Server.Core.Commands
       Log = LogManager.GetLogger(this.GetType());
     }
 
-    protected DatabaseContext GetDbContext(bool useLoggerFactory = true) => Main.GetDbContext(useLoggerFactory);
+    protected DatabaseContext GetDbContext(bool useLoggerFactory = false) => Main.GetDbContext(useLoggerFactory);
   }
 }
diff --git a/ReallifeGamemode.Server.Core/Main.cs b/ReallifeGamemode.Server.Core/Main.cs
index 128b4d58..bceec473 100644
--- a/ReallifeGamemode.Server.Core/Main.cs
+++ b/ReallifeGamemode.Server.Core/Main.cs
@@ -64,7 +64,7 @@ namespace ReallifeGamemode.Server.Core
       }
     }
 
-    public static DatabaseContext GetDbContext(bool useLoggerFactory = true)
+    public static DatabaseContext GetDbContext(bool useLoggerFactory = false)
     {
       return new DatabaseContext(useLoggerFactory);
     }
diff --git a/ReallifeGamemode.Server.Core/Script.cs b/ReallifeGamemode.Server.Core/Script.cs
index 5d87f5d2..c3474a38 100644
--- a/ReallifeGamemode.Server.Core/Script.cs
+++ b/ReallifeGamemode.Server.Core/Script.cs
@@ -21,6 +21,6 @@ namespace ReallifeGamemode.Server.Core
       Log = LogManager.GetLogger(GetType());
     }
 
-    protected DatabaseContext GetDbContext(bool useLoggerFactory = true) => Main.GetDbContext(useLoggerFactory);
+    protected DatabaseContext GetDbContext(bool useLoggerFactory = false) => Main.GetDbContext(useLoggerFactory);
   }
 }
diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs
index c11dcb65..ac533405 100644
--- a/ReallifeGamemode.Server/Commands/AdminCommands.cs
+++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs
@@ -1493,30 +1493,30 @@ namespace ReallifeGamemode.Server.Commands
         {
           case null:
             target.SetSharedData("blipColor", 0);
-            player.SetSharedData("nameTagColor", 0);
+            target.SetSharedData("nameTagColor", 0);
             break;
 
           case 0:
-            player.SetSharedData("nameTagColor", 0);
+            target.SetSharedData("nameTagColor", 0);
             break;
 
           case 8:
-            player.SetSharedData("nameTagColor", 8);
+            target.SetSharedData("nameTagColor", 8);
             break;
 
           case 7:
-            player.SetSharedData("nameTagColor", 7);
+            target.SetSharedData("nameTagColor", 7);
             break;
 
           case 4:
-            player.SetSharedData("nameTagColor", 4);
+            target.SetSharedData("nameTagColor", 4);
             break;
           case 9:
-            player.SetSharedData("nameTagColor", 9);
+            target.SetSharedData("nameTagColor", 9);
             break;
         }
         target.TriggerEvent("jailTime", 0);
-        if (targetUser.FactionId != null) player.SetSharedData("nameTagColor", targetUser.FactionId);
+        if (targetUser.FactionId != null) target.SetSharedData("nameTagColor", targetUser.FactionId);
         targetUser.Wanteds = 0;
         dbContext.SaveChanges();
       }
@@ -2452,7 +2452,7 @@ namespace ReallifeGamemode.Server.Commands
         {
           case null:
             target.SetSharedData("blipColor", 0);
-            player.SetSharedData("nameTagColor", 0);
+            target.SetSharedData("nameTagColor", 0);
             break;
 
           case 0:
@@ -2475,7 +2475,7 @@ namespace ReallifeGamemode.Server.Commands
             
             break;
         }
-        if (u.FactionId != null) player.SetSharedData("nameTagColor", u.FactionId);
+        if (u.FactionId != null) target.SetSharedData("nameTagColor", u.FactionId);
         dbContext.SaveChanges();
       }
     }
@@ -2522,7 +2522,7 @@ namespace ReallifeGamemode.Server.Commands
         {
           case null:
             target.SetSharedData("blipColor", 0);
-            player.SetSharedData("nameTagColor", 0);
+            target.SetSharedData("nameTagColor", 0);
             break;
 
           case 8:
@@ -2540,7 +2540,7 @@ namespace ReallifeGamemode.Server.Commands
             target.SetSharedData("blipColor", 25);
             break;
         }
-        if (u.FactionId != null) player.SetSharedData("nameTagColor", u.FactionId);
+        if (u.FactionId != null) target.SetSharedData("nameTagColor", u.FactionId);
         dbContext.SaveChanges();
       }
     }
diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs
index bac65955..a41601a1 100644
--- a/ReallifeGamemode.Server/Commands/FactionCommands.cs
+++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs
@@ -51,13 +51,13 @@ namespace ReallifeGamemode.Server.Commands
         ChatService.NotAuthorized(player);
         return;
       }
-      if (f.Name == "Ballas" || f.Name == "Grove" || user.IsAdmin(AdminLevel.ADMIN))
+      if (f?.Name == "Ballas" || f?.Name == "Grove" || user.IsAdmin(AdminLevel.ADMIN))
       {
         message = Regex.Replace(message, "(~[a-zA-Z]~)|(!{(.*)})", "");
 
         string rank = string.Empty;
 
-        if(f.Name == "Ballas" || f.Name == "Grove")
+        if(f?.Name == "Ballas" || f?.Name == "Grove")
         {
           rank = player.GetUser().GetFactionRank().RankName;
         }