diff --git a/TempleWare-External/TempleWare-External.vcxproj b/TempleWare-External/TempleWare-External.vcxproj
index 3764459..541a2c5 100644
--- a/TempleWare-External/TempleWare-External.vcxproj
+++ b/TempleWare-External/TempleWare-External.vcxproj
@@ -43,7 +43,7 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -71,7 +71,10 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>external\json;$(IncludePath)</IncludePath>
+    <IncludePath>external\json;$(IncludePath);$(ProjectDir)external\json</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);;$(ProjectDir)external\json</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -109,10 +112,12 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>d3d9.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff --git a/TempleWare-External/imgui.ini b/TempleWare-External/imgui.ini
new file mode 100644
index 0000000..4a5c201
--- /dev/null
+++ b/TempleWare-External/imgui.ini
@@ -0,0 +1,5 @@
+[Window][Debug##Default]
+Pos=60,60
+Size=400,400
+Collapsed=0
+
diff --git a/TempleWare-External/source/features/glow.cpp b/TempleWare-External/source/features/glow.cpp
index 8092262..568010f 100644
--- a/TempleWare-External/source/features/glow.cpp
+++ b/TempleWare-External/source/features/glow.cpp
@@ -11,27 +11,27 @@ namespace features {
         const uintptr_t localPlayerController = memory.Read<uintptr_t>(globals::client + offsets::dwLocalPlayerController);
         if (!localPlayerController) return;
 
-        const int localTeam = memory.Read<int>(localPlayerController + offsets::m_iTeamNum);
+        const int localTeam = memory.Read<short>(localPlayerController + offsets::m_iTeamNum);
         const uintptr_t entityList = memory.Read<uintptr_t>(globals::client + offsets::dwEntityList);
         if (!entityList) return;
 
         for (int i = 1; i < 64; ++i) {
-            const uintptr_t listEntry = memory.Read<uintptr_t>(entityList + ((8 * (i & 0x7FFF)) >> 9) + 16);
+            const uintptr_t listEntry = memory.Read<uintptr_t>(entityList + (8 * (i >> 9)) + 16);
             if (!listEntry) continue;
 
-            const uintptr_t player = memory.Read<uintptr_t>(listEntry + 120 * (i & 0x1FF));
+            const uintptr_t player = memory.Read<uintptr_t>(listEntry + 112 * (i & 0x1FF));
             if (!player) continue;
 
-            const int playerTeam = memory.Read<int>(player + offsets::m_iTeamNum);
+            const short playerTeam = memory.Read<short>(player + offsets::m_iTeamNum);
             if (playerTeam == localTeam) continue;
 
             const uint32_t playerPawn = memory.Read<uint32_t>(player + offsets::m_hPlayerPawn);
             if (!playerPawn) continue;
 
-            const uintptr_t listEntry2 = memory.Read<uintptr_t>(entityList + ((8 * (playerPawn & 0x7FFF)) >> 9) + 16);
+            const uintptr_t listEntry2 = memory.Read<uintptr_t>(entityList + 8 * ((playerPawn & 0x7FFF) >> 9) + 16);
             if (!listEntry2) continue;
 
-            const uintptr_t playerCsPawn = memory.Read<uintptr_t>(listEntry2 + 120 * (playerPawn & 0x1FF));
+            const uintptr_t playerCsPawn = memory.Read<uintptr_t>(listEntry2 + 112 * (playerPawn & 0x1FF));
             if (!playerCsPawn) continue;
 
             const int health = memory.Read<int>(playerCsPawn + offsets::m_iHealth);
diff --git a/TempleWare-External/source/features/triggerbot.cpp b/TempleWare-External/source/features/triggerbot.cpp
index ac67e5d..e6dece9 100644
--- a/TempleWare-External/source/features/triggerbot.cpp
+++ b/TempleWare-External/source/features/triggerbot.cpp
@@ -40,7 +40,7 @@ namespace features
             }
 
             std::uintptr_t localPlayer = memory.Read<std::uintptr_t>(globals::client + offsets::dwLocalPlayerPawn);
-            BYTE team = memory.Read<BYTE>(localPlayer + offsets::m_iTeamNum);
+            short team = memory.Read<short>(localPlayer + offsets::m_iTeamNum);
 
             if (!globals::TriggerBotIgnoreFlash) 
             {
@@ -56,12 +56,12 @@ namespace features
                 continue;
 
             std::uintptr_t entityList = memory.Read<std::uintptr_t>(globals::client + offsets::dwEntityList);
-            std::uintptr_t entity = memory.Read<std::uintptr_t>(memory.Read<std::uintptr_t>(entityList + 0x8 * (crosshairEntityIndex >> 9) + 0x10) + 120 * (crosshairEntityIndex & 0x1ff));
+            std::uintptr_t entity = memory.Read<std::uintptr_t>(memory.Read<std::uintptr_t>(entityList + 8 * (crosshairEntityIndex >> 9) + 16) + 112 * (crosshairEntityIndex & 0x1FF));
             if (!entity)
                 continue;
 
             // Skip teammate or dead target (optional)
-            if (globals::TriggerBotTeamCheck && team == memory.Read<BYTE>(entity + offsets::m_iTeamNum))
+            if (globals::TriggerBotTeamCheck && team == memory.Read<short>(entity + offsets::m_iTeamNum))
                 continue;
 
             if (memory.Read<int>(entity + offsets::m_iHealth) <= 0)
diff --git a/TempleWare-External/source/main.cpp b/TempleWare-External/source/main.cpp
index c1544dc..7262830 100644
--- a/TempleWare-External/source/main.cpp
+++ b/TempleWare-External/source/main.cpp
@@ -32,7 +32,9 @@ int __stdcall wWinMain(HINSTANCE instance, HINSTANCE previousInstance, PWSTR arg
 
     while (globals::isRunning)
     {
-        if (GetAsyncKeyState(VK_END) & 0x8000) 
+        if ((GetAsyncKeyState(VK_END) & 0x8000)     || 
+            (GetAsyncKeyState(VK_INSERT) & 0x8000)  ||
+            (GetAsyncKeyState(VK_HOME) & 0x8000))
         {
             windowVisible = !windowVisible;
             ShowWindow(gui::window, windowVisible ? SW_SHOW : SW_HIDE);
diff --git a/TempleWare-External/source/offsets/offsets.cpp b/TempleWare-External/source/offsets/offsets.cpp
index 32159c1..3a75866 100644
--- a/TempleWare-External/source/offsets/offsets.cpp
+++ b/TempleWare-External/source/offsets/offsets.cpp
@@ -52,7 +52,7 @@ bool offsets::UpdateOffset()
     m_bGlowing=                     client_dllJson["CGlowProperty"]["fields"]["m_bGlowing"];
     m_bIsScoped=                    client_dllJson["C_CSPlayerPawn"]["fields"]["m_bIsScoped"];
     attack=                         buttonsJson["client.dll"]["attack"];
-    m_iIDEntIndex=                  client_dllJson["C_CSPlayerPawnBase"]["fields"]["m_iIDEntIndex"];;
+    m_iIDEntIndex=                  client_dllJson["C_CSPlayerPawn"]["fields"]["m_iIDEntIndex"];;
     flFlashDuration=                client_dllJson["C_CSPlayerPawnBase"]["fields"]["m_flFlashDuration"];
     m_iShotsFired =                 client_dllJson["C_CSPlayerPawn"]["fields"]["m_iShotsFired"];
     m_aimPunchAngle =               client_dllJson["C_CSPlayerPawn"]["fields"]["m_aimPunchAngle"];