diff --git a/src/entityhitboxcache.cpp b/src/entityhitboxcache.cpp
index 721b264f..867bc09d 100644
--- a/src/entityhitboxcache.cpp
+++ b/src/entityhitboxcache.cpp
@@ -128,7 +128,7 @@ matrix3x4_t *EntityHitboxCache::GetBones()
     {
         if (g_Settings.is_create_move)
         {
-#if ENABLE_TEXTMODE
+#if !ENABLE_TEXTMODE
             if (!*bonecache_enabled || parent_ref->m_Type() != ENTITY_PLAYER || IsPlayerInvisible(parent_ref))
             {
                 PROF_SECTION(bone_setup);
diff --git a/src/hacks/Aimbot.cpp b/src/hacks/Aimbot.cpp
index c1214db0..a7a27bdf 100644
--- a/src/hacks/Aimbot.cpp
+++ b/src/hacks/Aimbot.cpp
@@ -125,7 +125,7 @@ static void doAutoZoom(bool target_found)
     {
         if (target_found)
             zoomTime.update();
-        if (isIdle || !zoomTime.check(5000))
+        if (isIdle || !zoomTime.check(3000))
         {
             current_user_cmd->buttons |= IN_ATTACK2;
         }
diff --git a/src/hacks/AntiAntiAim.cpp b/src/hacks/AntiAntiAim.cpp
index b5507f50..cd50fed2 100644
--- a/src/hacks/AntiAntiAim.cpp
+++ b/src/hacks/AntiAntiAim.cpp
@@ -105,23 +105,33 @@ void increaseBruteNum(int idx)
 
 static void pitchHook(const CRecvProxyData *pData, void *pStruct, void *pOut)
 {
-    float *ang = (float *) pOut;
-    *ang       = pData->m_Value.m_Float;
+    float flPitch      = pData->m_Value.m_Float;
+    float *flPitch_out = (float *) pOut;
+
+    if (!enable)
+    {
+        *flPitch_out = flPitch;
+        return;
+    }
 
     auto client_ent   = (IClientEntity *) (pStruct);
     CachedEntity *ent = ENTITY(client_ent->entindex());
     if (CE_GOOD(ent))
-        *ang = resolveAnglePitch(pData->m_Value.m_Float, resolver_map[ent->player_info.friendsID]);
+        *flPitch_out = resolveAnglePitch(flPitch, resolver_map[ent->player_info.friendsID]);
 }
 
 static void yawHook(const CRecvProxyData *pData, void *pStruct, void *pOut)
 {
-    float flYaw = pData->m_Value.m_Float;
-
+    float flYaw      = pData->m_Value.m_Float;
     float *flYaw_out = (float *) pOut;
 
-    auto client_ent = (IClientEntity *) (pStruct);
+    if (!enable)
+    {
+        *flYaw_out = flYaw;
+        return;
+    }
 
+    auto client_ent   = (IClientEntity *) (pStruct);
     CachedEntity *ent = ENTITY(client_ent->entindex());
     if (CE_GOOD(ent))
         *flYaw_out = resolveAngleYaw(flYaw, resolver_map[ent->player_info.friendsID]);
diff --git a/src/hooks/visual/IN_KeyEvent.cpp b/src/hooks/visual/IN_KeyEvent.cpp
index 0b4cde88..ab98b9f6 100644
--- a/src/hooks/visual/IN_KeyEvent.cpp
+++ b/src/hooks/visual/IN_KeyEvent.cpp
@@ -10,13 +10,6 @@ namespace hooked_methods
 
 DEFINE_HOOKED_METHOD(IN_KeyEvent, int, void *this_, int eventcode, ButtonCode_t keynum, const char *binding)
 {
-#if ENABLE_GUI
-/*
-if (g_pGUI->ConsumesKey((ButtonCode_t)keynum) && g_pGUI->Visible()) {
-    return 0;
-}
-*/
-#endif
     return original::IN_KeyEvent(this_, eventcode, keynum, binding);
 }
-} // namespace hooked_methods
\ No newline at end of file
+} // namespace hooked_methods
diff --git a/src/visual/EffectChams.cpp b/src/visual/EffectChams.cpp
index bfc7a9c3..9857b310 100644
--- a/src/visual/EffectChams.cpp
+++ b/src/visual/EffectChams.cpp
@@ -343,7 +343,7 @@ void EffectChams::Render(int x, int y, int w, int h)
 {
 #if !ENFORCE_STREAM_SAFETY
     PROF_SECTION(DRAW_chams);
-    if (!isHackActive())
+    if (!isHackActive() || disable_visuals)
         return;
     if (!effect_chams::enable)
         return;
diff --git a/src/visual/EffectGlow.cpp b/src/visual/EffectGlow.cpp
index edee59e9..be1b0a46 100644
--- a/src/visual/EffectGlow.cpp
+++ b/src/visual/EffectGlow.cpp
@@ -448,7 +448,7 @@ void EffectGlow::Render(int x, int y, int w, int h)
 #if !ENFORCE_STREAM_SAFETY
     if (!enable)
         return;
-    if (!isHackActive() || (clean_screenshots && g_IEngine->IsTakingScreenshot()) || g_Settings.bInvalid)
+    if (!isHackActive() || (clean_screenshots && g_IEngine->IsTakingScreenshot()) || g_Settings.bInvalid || disable_visuals)
         return;
     static ITexture *orig;
     static IClientEntity *ent;