From 1f5a118cb984ba4c92643cf9617df047747d2339 Mon Sep 17 00:00:00 2001
From: maybegreat48 <96936658+maybegreat48@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:38:30 +0000
Subject: [PATCH] Bug fixes and improvements (#984)

* feat(KickFromInterior): improve kick from interior

Fixes #968
Fixes #953
Fixes #901
Fixes #899
Fixes #813
Fixes #726
Fixes #723

Co-authored-by: Yimura <24669514+Yimura@users.noreply.github.com>
---
 scripts/gtav-classes.cmake                    |    2 +-
 src/backend/backend.cpp                       |    1 -
 .../player/toxic/kick_from_interior.cpp       |  129 ++-
 .../self/request_services.cpp                 |    0
 src/backend/looped/looped.hpp                 |    1 -
 src/backend/looped/self/beast_jump.cpp        |    2 +-
 src/backend/looped/self/dance_mode.cpp        |   13 +-
 src/backend/looped/self/godmode.cpp           |   45 +-
 src/backend/looped/self/invisibility.cpp      |    9 +-
 src/backend/looped/self/police.cpp            |    2 +-
 src/backend/looped/self/ptfx.cpp              |    2 +-
 src/backend/looped/self/super_jump.cpp        |    2 +-
 src/backend/looped/self/superman.cpp          |    2 +-
 src/backend/looped/self/unlimited_oxygen.cpp  |    4 +-
 .../looped/system/auto_tp_to_waypoint.cpp     |    4 +-
 src/backend/looped/vehicle/invisibility.cpp   |   19 +-
 src/backend/looped/vehicle/keep_on_ground.cpp |    7 +-
 src/backend/looped/vehicle/vehicle_god.cpp    |   22 +-
 src/backend/looped/world/blackhole.cpp        |    7 +-
 src/backend/script_patches.hpp                |    3 +-
 src/core/data/all_script_names.hpp            | 1028 +++++++++++++++++
 src/core/data/packet_types.hpp                |    2 +-
 src/core/data/stack_sizes.hpp                 |   36 +
 src/core/globals.hpp                          |    4 +-
 src/core/scr_globals.hpp                      |    3 +-
 src/gta/script_handler.hpp                    |   46 +-
 src/gta_util.hpp                              |   41 +-
 src/hooking.cpp                               |    2 +
 src/hooking.hpp                               |    5 +-
 src/hooks/protections/can_apply_data.cpp      |    2 +
 src/hooks/protections/receive_net_message.cpp |   50 -
 src/hooks/protections/received_event.cpp      |    2 +-
 src/hooks/script/script_vm.cpp                |   25 +
 .../write_player_camera_data_node.cpp         |   22 +
 src/native_hooks/all_scripts.hpp              |   19 +-
 src/native_hooks/freemode.hpp                 |   41 +-
 src/native_hooks/native_hooks.cpp             |    2 +
 src/native_hooks/network_session_host.hpp     |    2 +-
 src/pointers.cpp                              |    6 +
 src/pointers.hpp                              |    2 +
 src/services/players/player.hpp               |    2 +-
 src/services/vehicle/persist_car_service.cpp  |    2 +-
 src/views/debug/view_debug.cpp                |    1 +
 src/views/debug/view_debug.hpp                |    1 +
 src/views/debug/view_debug_threads.cpp        |  177 +++
 src/views/network/view_spoofing.cpp           |    2 +
 src/views/players/player/player_info.cpp      |    2 +-
 src/views/self/view_self.cpp                  |    7 +-
 src/views/self/view_weapons.cpp               |    2 +-
 src/views/vehicle/view_vehicle.cpp            |    1 -
 50 files changed, 1658 insertions(+), 155 deletions(-)
 rename src/backend/{looped => commands}/self/request_services.cpp (100%)
 create mode 100644 src/core/data/all_script_names.hpp
 create mode 100644 src/core/data/stack_sizes.hpp
 create mode 100644 src/hooks/spoofing/write_player_camera_data_node.cpp
 create mode 100644 src/views/debug/view_debug_threads.cpp

diff --git a/scripts/gtav-classes.cmake b/scripts/gtav-classes.cmake
index 8856518f..e5436c88 100644
--- a/scripts/gtav-classes.cmake
+++ b/scripts/gtav-classes.cmake
@@ -3,7 +3,7 @@ include(FetchContent)
 FetchContent_Declare(
     gtav_classes
     GIT_REPOSITORY https://github.com/Yimura/GTAV-Classes.git
-    GIT_TAG        2862a02e24ebfedc60432887e735efef56d83635
+    GIT_TAG        c5c72f78ffef24ea7faf8791b37fb6d61c1b5fc4
     GIT_PROGRESS TRUE
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
diff --git a/src/backend/backend.cpp b/src/backend/backend.cpp
index 28ce385e..ce07d5d8 100644
--- a/src/backend/backend.cpp
+++ b/src/backend/backend.cpp
@@ -37,7 +37,6 @@ namespace big
 
 		while (g_running)
 		{
-			looped::self_godmode();
 			looped::self_police();
 			looped::self_hud();
 			looped::self_dance_mode();
diff --git a/src/backend/commands/player/toxic/kick_from_interior.cpp b/src/backend/commands/player/toxic/kick_from_interior.cpp
index 2b920674..2988ad82 100644
--- a/src/backend/commands/player/toxic/kick_from_interior.cpp
+++ b/src/backend/commands/player/toxic/kick_from_interior.cpp
@@ -1,8 +1,14 @@
+#include "hooking.hpp"
 #include "backend/player_command.hpp"
 #include "natives.hpp"
 #include "pointers.hpp"
 #include "gta/net_object_mgr.hpp"
 #include "core/scr_globals.hpp"
+#include "fiber_pool.hpp"
+#include "gta/script_handler.hpp"
+#include "util/scripts.hpp"
+
+#include <script/globals/GPBD_FM.hpp>
 
 namespace big
 {
@@ -17,15 +23,122 @@ namespace big
 
 		virtual void execute(player_ptr player, const std::vector<std::uint64_t>& _args, const std::shared_ptr<command_context> ctx)
 		{
-			const size_t arg_count = 8;
-			int64_t args[arg_count]{
-				(int64_t)eRemoteEvent::KickFromInterior,
-				(int64_t)self::id,
-				*scr_globals::globalplayer_bd.at(player->id(), scr_globals::size::globalplayer_bd).at(321).at(7).as<int64_t*>(),
-				*scr_globals::globalplayer_bd.at(player->id(), scr_globals::size::globalplayer_bd).at(321).at(8).as<int64_t*>(),
-			};
+			if (scr_globals::gpbd_fm_1.as<GPBD_FM*>()->Entries[player->id()].PropertyData.Index != -1)
+			{ 
+				int id = player->id();
+				g_fiber_pool->queue_job([id]
+				{
+					int instance = -1;
+
+					for (int i = 0; i < 32; i++)
+					{
+						if (NETWORK::NETWORK_IS_PLAYER_A_PARTICIPANT_ON_SCRIPT(id, "am_mp_property_int", i))
+						{
+							instance = i;
+							break;
+						}
+					}
+					
+
+					if (instance == -1)
+					{
+						return;
+					}
+
+					while (!SCRIPT::HAS_SCRIPT_WITH_NAME_HASH_LOADED(RAGE_JOAAT("am_mp_property_int")))
+					{
+						SCRIPT::REQUEST_SCRIPT_WITH_NAME_HASH(RAGE_JOAAT("am_mp_property_int"));
+						script::get_current()->yield();
+					}
+
+					auto program = gta_util::find_script_program(RAGE_JOAAT("am_mp_property_int"));
+
+					int count = program->m_local_count;
+					program->m_local_count = 2;
+					int id = SYSTEM::START_NEW_SCRIPT_WITH_NAME_HASH(RAGE_JOAAT("am_mp_property_int"), 1424);
+					program->m_local_count = count;
+
+					auto script = gta_util::find_script_thread_by_id(id);
+
+					if (!script)
+						return;
+
+					script->m_context.m_state = rage::eThreadState::unk_3;
+					
+
+					gta_util::execute_as_script(script, [instance]
+					{
+						if (auto hook = g_hooking->m_handler_hooks[(CGameScriptHandler*)rage::scrThread::get()->m_handler].get())
+						{
+							hook->disable();
+							g_hooking->m_handler_hooks.erase((CGameScriptHandler*)rage::scrThread::get()->m_handler);
+						}
+
+						NETWORK::NETWORK_SET_THIS_SCRIPT_IS_NETWORK_SCRIPT(32, true, instance);
+					});
+
+					for (int i = 0; i < 100; i++)
+					{
+						int status = 0;
+						gta_util::execute_as_script(script, [&status] { status = NETWORK::NETWORK_GET_SCRIPT_STATUS(); });
+
+						if (status == 2)
+							break;
+
+						if (status > 2)
+						{
+							script->kill();
+							return;
+						}
+
+						script::get_current()->yield(50ms);
+					}
+
+					static uint64_t server_vars[1358]{};
+					static uint64_t client_vars[1185]{};
+
+					gta_util::execute_as_script(script, []
+					{
+						NETWORK::NETWORK_REGISTER_HOST_BROADCAST_VARIABLES((int*)server_vars, 1358, 0);
+						NETWORK::NETWORK_REGISTER_PLAYER_BROADCAST_VARIABLES((int*)client_vars, 1185, 0);
+					});
+
+					for (int i = 0; i < 3600; i++)
+					{
+						bool received = false;
+						gta_util::execute_as_script(script, [&received] { received = NETWORK::NETWORK_HAS_RECEIVED_HOST_BROADCAST_DATA(); });
+
+						if (received)
+							break;
+
+						script::get_current()->yield();
+					}
+
+					if (!scripts::force_host(RAGE_JOAAT("am_mp_property_int")))
+					{
+						script->kill();
+						return;
+					}
+
+					server_vars[717] = 1;
+					script::get_current()->yield(3s);
+
+					script->kill();
+				});
+			}
+			else
+			{
+				const size_t arg_count = 8;
+				int64_t args[arg_count]{
+					(int64_t)eRemoteEvent::KickFromInterior,
+					(int64_t)self::id,
+					*scr_globals::globalplayer_bd.at(player->id(), scr_globals::size::globalplayer_bd).at(321).at(7).as<int64_t*>(),
+					*scr_globals::globalplayer_bd.at(player->id(), scr_globals::size::globalplayer_bd).at(321).at(8).as<int64_t*>(),
+				};
+
+				g_pointers->m_trigger_script_event(1, args, arg_count, 1 << player->id());
+			}
 
-			g_pointers->m_trigger_script_event(1, args, arg_count, 1 << player->id());
 		}
 	};
 
diff --git a/src/backend/looped/self/request_services.cpp b/src/backend/commands/self/request_services.cpp
similarity index 100%
rename from src/backend/looped/self/request_services.cpp
rename to src/backend/commands/self/request_services.cpp
diff --git a/src/backend/looped/looped.hpp b/src/backend/looped/looped.hpp
index 179fa4fa..75eca531 100644
--- a/src/backend/looped/looped.hpp
+++ b/src/backend/looped/looped.hpp
@@ -24,7 +24,6 @@ namespace big
 		static void player_spectate();
 		static void player_remote_control_vehicle();
 
-		static void self_godmode();
 		static void self_police();
 		static void self_hud();
 		static void self_dance_mode();
diff --git a/src/backend/looped/self/beast_jump.cpp b/src/backend/looped/self/beast_jump.cpp
index 7a657fce..aff14308 100644
--- a/src/backend/looped/self/beast_jump.cpp
+++ b/src/backend/looped/self/beast_jump.cpp
@@ -18,5 +18,5 @@ namespace big
 		}
 	};
 	
-	beast_jump_looped g_beast_jump_looped("beastjump", "Beast Jump", "Allows You To Jump As If You Were The Beast Like In The Beast Event", g.self.beast_jump);
+	beast_jump_looped g_beast_jump_looped("beastjump", "Beast Jump", "Allows you to jump as if you were the beast like in the Hunt the Beast event", g.self.beast_jump);
 }
diff --git a/src/backend/looped/self/dance_mode.cpp b/src/backend/looped/self/dance_mode.cpp
index cf05a75d..6e2f365e 100644
--- a/src/backend/looped/self/dance_mode.cpp
+++ b/src/backend/looped/self/dance_mode.cpp
@@ -4,6 +4,7 @@
 #include "util/scripts.hpp"
 #include "script_function.hpp"
 #include "services/script_patcher/script_patcher_service.hpp"
+#include "hooking.hpp"
 
 namespace big
 {
@@ -26,7 +27,7 @@ namespace big
 			if (!thread)
 				return;
 
-			g.m_dance_thread = gta_util::find_script_thread(RAGE_JOAAT("am_mp_nightclub"));
+			g.m_dance_thread = gta_util::find_script_thread_by_id(thread);
 			g.m_dance_program = gta_util::find_script_program(RAGE_JOAAT("am_mp_nightclub"));
 
 			(*g_pointers->m_script_handler_mgr)->attach_thread(g.m_dance_thread);
@@ -34,9 +35,15 @@ namespace big
 			g.m_dance_thread->m_context.m_state = rage::eThreadState::unk_3;
 
 			// perform initial setup
-			gta_util::execute_as_script(RAGE_JOAAT("am_mp_nightclub"), []
+			gta_util::execute_as_script(g.m_dance_thread, []
 			{
-				NETWORK::NETWORK_SET_THIS_SCRIPT_IS_NETWORK_SCRIPT(32, false, 32);
+				if (auto hook = g_hooking->m_handler_hooks[(CGameScriptHandler*)rage::scrThread::get()->m_handler].get())
+				{
+					hook->disable();
+					g_hooking->m_handler_hooks.erase((CGameScriptHandler*)rage::scrThread::get()->m_handler);
+				}
+
+				NETWORK::NETWORK_SET_THIS_SCRIPT_IS_NETWORK_SCRIPT(32, true, 32);
 				scr_functions::init_nightclub_script({});
 			});
 
diff --git a/src/backend/looped/self/godmode.cpp b/src/backend/looped/self/godmode.cpp
index 6eb6ab3a..d0fe65e5 100644
--- a/src/backend/looped/self/godmode.cpp
+++ b/src/backend/looped/self/godmode.cpp
@@ -1,26 +1,41 @@
 #include "backend/looped/looped.hpp"
+#include "natives.hpp"
+#include "backend/looped_command.hpp"
 
 namespace big
 {
-	static uint32_t last_bits = 0;
-	static float last_water_collistion_strength = 0;
-
-	void looped::self_godmode()
+	class godmode_internal : looped_command
 	{
-		if (g_local_player == nullptr)
+		using looped_command::looped_command;
+
+		uint32_t last_bits = 0;
+
+		virtual void on_tick() override
 		{
-			return;
+			if (g_local_player == nullptr)
+			{
+				return;
+			}
+
+			uint32_t bits = g.self.proof_mask;
+			uint32_t changed_bits = bits ^ last_bits;
+			uint32_t changed_or_enabled_bits = bits | changed_bits;
+
+			if (changed_or_enabled_bits)
+			{
+				uint32_t unchanged_bits = g_local_player->m_damage_bits & ~changed_or_enabled_bits;
+				g_local_player->m_damage_bits = unchanged_bits | bits;
+				last_bits = bits;
+			}
 		}
 
-		uint32_t bits = g.self.proof_mask;
-		uint32_t changed_bits = bits ^ last_bits;
-		uint32_t changed_or_enabled_bits = bits | changed_bits;
-
-		if (changed_or_enabled_bits)
+		virtual void on_disable() override
 		{
-			uint32_t unchanged_bits = g_local_player->m_damage_bits & ~changed_or_enabled_bits;
-			g_local_player->m_damage_bits = unchanged_bits | bits;
-			last_bits = bits;
+			g_local_player->m_damage_bits = 0;
 		}
-	}
+	};
+
+	static bool true_ref = true;
+	godmode_internal g_godmode_internal("$$godmode", "", "", true_ref);
+	bool_command g_godmode("godmode", "God Mode", "Prevents you from taking any form of damage", g.self.god_mode);
 }
\ No newline at end of file
diff --git a/src/backend/looped/self/invisibility.cpp b/src/backend/looped/self/invisibility.cpp
index fa47de70..4cfbd022 100644
--- a/src/backend/looped/self/invisibility.cpp
+++ b/src/backend/looped/self/invisibility.cpp
@@ -3,6 +3,9 @@
 #include "natives.hpp"
 #include "backend/looped_command.hpp"
 
+#include "core/scr_globals.hpp"
+#include <script/globals/GlobalPlayerBD.hpp>
+
 namespace big
 {
 	class invisibility : looped_command
@@ -12,16 +15,20 @@ namespace big
 		virtual void on_tick() override
 		{
 			ENTITY::SET_ENTITY_VISIBLE(self::ped, false, 0);
+
 			if (g.self.local_visibility)
 				NETWORK::SET_ENTITY_LOCALLY_VISIBLE(self::ped);
+
+			scr_globals::globalplayer_bd.as<GlobalPlayerBD*>()->Entries[self::id].IsInvisible = true;
 		}
 
 		virtual void on_disable() override
 		{
 			ENTITY::SET_ENTITY_VISIBLE(self::ped, true, 0);
+			scr_globals::globalplayer_bd.as<GlobalPlayerBD*>()->Entries[self::id].IsInvisible = false;
 		}
 	};
 
 	invisibility g_invisibility("invis", "Invisiblity", "Makes you invisible", g.self.invisibility);
-	bool_command g_local_visibility("localvis", "Visible Locally", "Makes you visible to yourself, other players will still not be able to see you", g.self.local_visibility);
+	bool_command g_local_visibility("localvis", "Visible Locally", "Makes you visible to yourself, but other players would still not be able to see you", g.self.local_visibility);
 }
diff --git a/src/backend/looped/self/police.cpp b/src/backend/looped/self/police.cpp
index 100f8a27..cc4dfe80 100644
--- a/src/backend/looped/self/police.cpp
+++ b/src/backend/looped/self/police.cpp
@@ -25,7 +25,7 @@ namespace big
 			bLast = b;
 		}
 
-		if(g.self.force_wanted_level && !b)
+		if (g.self.force_wanted_level && !b)
 			g_local_player->m_player_info->m_wanted_level = g.self.wanted_level;
 	}
 }
\ No newline at end of file
diff --git a/src/backend/looped/self/ptfx.cpp b/src/backend/looped/self/ptfx.cpp
index 3fb3a8c8..2fd69cc8 100644
--- a/src/backend/looped/self/ptfx.cpp
+++ b/src/backend/looped/self/ptfx.cpp
@@ -48,7 +48,7 @@ namespace big
 
 		virtual void on_tick() override
 		{
-			if(self::veh == 0)
+			if (self::veh == 0)
 				show_player_ptfx_effect(g.self.ptfx_effects.asset, g.self.ptfx_effects.effect);
 			else
 				show_vehicle_ptfx_effect(g.self.ptfx_effects.asset, g.self.ptfx_effects.effect);
diff --git a/src/backend/looped/self/super_jump.cpp b/src/backend/looped/self/super_jump.cpp
index 1bc81d48..c2befcef 100644
--- a/src/backend/looped/self/super_jump.cpp
+++ b/src/backend/looped/self/super_jump.cpp
@@ -27,5 +27,5 @@ namespace big
 		}
 	};
 
-	super_jump_looped g_super_jump_looped("superjump", "Super Jump", "Allows You To Jump Really High", g.self.super_jump);
+	super_jump_looped g_super_jump_looped("superjump", "Super Jump", "Allows you to jump really high", g.self.super_jump);
 }
\ No newline at end of file
diff --git a/src/backend/looped/self/superman.cpp b/src/backend/looped/self/superman.cpp
index 9e329fd7..1be2e6f6 100644
--- a/src/backend/looped/self/superman.cpp
+++ b/src/backend/looped/self/superman.cpp
@@ -37,5 +37,5 @@ namespace big
 		}
 	};
 
-	superman g_superman("superman", "Superman", "Fly like a superman..", g.self.superman);
+	superman g_superman("superman", "Superman", "Fly like a superman", g.self.superman);
 }
diff --git a/src/backend/looped/self/unlimited_oxygen.cpp b/src/backend/looped/self/unlimited_oxygen.cpp
index 82794eeb..1a8e1e8b 100644
--- a/src/backend/looped/self/unlimited_oxygen.cpp
+++ b/src/backend/looped/self/unlimited_oxygen.cpp
@@ -10,8 +10,8 @@ namespace big
 
 		virtual void on_tick() override
 		{
-			//if (g_local_player)
-			//	g_local_player->m_ped_intelligence->m_oxygen_time = 0;
+			if (g_local_player)
+				g_local_player->m_ped_intelligence->m_oxygen_time = 0;
 		}
 	};
 
diff --git a/src/backend/looped/system/auto_tp_to_waypoint.cpp b/src/backend/looped/system/auto_tp_to_waypoint.cpp
index 5923a738..2a414a37 100644
--- a/src/backend/looped/system/auto_tp_to_waypoint.cpp
+++ b/src/backend/looped/system/auto_tp_to_waypoint.cpp
@@ -14,9 +14,7 @@ namespace big
             if (!teleport::to_blip((int)BlipIcons::Waypoint))
                 return;
 
-            bool temp_disable_tp = (!*g_pointers->m_is_session_started) && CUTSCENE::IS_CUTSCENE_ACTIVE();
-            if (!temp_disable_tp)
-                teleport::to_waypoint();
+            teleport::to_waypoint();
         }
     };
 
diff --git a/src/backend/looped/vehicle/invisibility.cpp b/src/backend/looped/vehicle/invisibility.cpp
index 285513e0..25720caf 100644
--- a/src/backend/looped/vehicle/invisibility.cpp
+++ b/src/backend/looped/vehicle/invisibility.cpp
@@ -9,13 +9,27 @@ namespace big
 	{
 		using looped_command::looped_command;
 
+		bool last_driving = false;
+
 		virtual void on_tick() override
 		{
+			if (!PED::GET_PED_CONFIG_FLAG(self::ped, 62, false))
+			{
+				if (last_driving)
+				{
+					ENTITY::SET_ENTITY_VISIBLE(self::veh, true, 0);
+				}
+
+				last_driving = false;
+				return;
+			}
+
+			last_driving = true;
+
 			ENTITY::SET_ENTITY_VISIBLE(self::veh, false, 0);
+
 			if (g.vehicle.localveh_visibility)
 				NETWORK::SET_ENTITY_LOCALLY_VISIBLE(self::veh);
-			if (g.vehicle.localped_visibility && g.vehicle.vehinvisibility)
-				ENTITY::SET_ENTITY_VISIBLE(self::ped, true, 0);
 		}
 
 		virtual void on_disable() override
@@ -26,5 +40,4 @@ namespace big
 
 	vehinvisibility g_vehinvisibility("invisveh", "Vehicle Invisiblity", "Makes your car invisible", g.vehicle.vehinvisibility);
 	bool_command g_localveh_visibility("localinvisveh", "Visible Locally", "Makes your car visible to yourself, other players will still not be able to see it", g.vehicle.localveh_visibility);
-	bool_command g_localped_visibility("localinvisped", "Self Visible", "Makes yourself visible driving the vehicle to others and yourself,\n car will still be invisible but you can be", g.vehicle.localped_visibility);
 }
diff --git a/src/backend/looped/vehicle/keep_on_ground.cpp b/src/backend/looped/vehicle/keep_on_ground.cpp
index 3e525f1c..29b1d94f 100644
--- a/src/backend/looped/vehicle/keep_on_ground.cpp
+++ b/src/backend/looped/vehicle/keep_on_ground.cpp
@@ -9,7 +9,12 @@ namespace big
 
 		virtual void on_tick() override
 		{
-			VEHICLE::SET_VEHICLE_ON_GROUND_PROPERLY(self::veh, 5.0);
+			auto model = ENTITY::GET_ENTITY_MODEL(self::veh);
+
+			if (ENTITY::IS_ENTITY_IN_AIR(self::veh) &&
+				(VEHICLE::IS_THIS_MODEL_A_CAR(model) ||
+				 VEHICLE::IS_THIS_MODEL_A_BIKE(model)))
+				VEHICLE::SET_VEHICLE_ON_GROUND_PROPERLY(self::veh, 5.0);
 		}
 	};
 
diff --git a/src/backend/looped/vehicle/vehicle_god.cpp b/src/backend/looped/vehicle/vehicle_god.cpp
index 75e8c9df..d1ace61e 100644
--- a/src/backend/looped/vehicle/vehicle_god.cpp
+++ b/src/backend/looped/vehicle/vehicle_god.cpp
@@ -1,10 +1,12 @@
 #include "backend/looped/looped.hpp"
 #include "util/misc.hpp"
+#include "natives.hpp"
 
 namespace big
 {
 	static uint32_t last_bits = 0;
 	static float last_water_collistion_strength = 0;
+	static bool last_driving;
 
 	void looped::vehicle_god_mode()
 	{
@@ -13,10 +15,22 @@ namespace big
 			return;
 		}
 
-		if (
-			(g.vehicle.god_mode || g.vehicle.proof_collision) &&
-			g_local_player->m_ped_task_flag & (int)ePedTask::TASK_DRIVING
-		) {
+		if (!PED::GET_PED_CONFIG_FLAG(self::ped, 62, false))
+		{
+			if (last_driving)
+			{
+				g_local_player->m_vehicle->m_deform_god = 0x9C;
+				g_local_player->m_vehicle->m_damage_bits = 0;
+			}
+
+			last_driving = false;
+			return;
+		}
+
+		last_driving = true;
+
+		if (g.vehicle.god_mode || g.vehicle.proof_collision) 
+		{
 			g_local_player->m_vehicle->m_deform_god = 0x8C;
 		}
 		else
diff --git a/src/backend/looped/world/blackhole.cpp b/src/backend/looped/world/blackhole.cpp
index a4ca566c..eab641c7 100644
--- a/src/backend/looped/world/blackhole.cpp
+++ b/src/backend/looped/world/blackhole.cpp
@@ -65,8 +65,11 @@ namespace big
 
 			for (auto entity : target_entities)
 			{
-				auto entity_coord = ENTITY::GET_ENTITY_COORDS(entity, false);
-				ENTITY::APPLY_FORCE_TO_ENTITY(entity, 1, ((g.world.blackhole.pos.x - entity_coord.x) * 9.f), ((g.world.blackhole.pos.y - entity_coord.y) * 9.f), ((g.world.blackhole.pos.z - entity_coord.z) * 9.f), 0.f, 0.f, 0.f, 0, false, true, true, 0, 0);
+				if (entity::take_control_of(entity, 0))
+				{
+					auto entity_coord = ENTITY::GET_ENTITY_COORDS(entity, false);
+					ENTITY::APPLY_FORCE_TO_ENTITY(entity, 1, ((g.world.blackhole.pos.x - entity_coord.x) * 9.f), ((g.world.blackhole.pos.y - entity_coord.y) * 9.f), ((g.world.blackhole.pos.z - entity_coord.z) * 9.f), 0.f, 0.f, 0.f, 0, false, true, true, 0, 0);
+				}
 			}
 
 			//draw blackhole
diff --git a/src/backend/script_patches.hpp b/src/backend/script_patches.hpp
index 53e48434..61dbc834 100644
--- a/src/backend/script_patches.hpp
+++ b/src/backend/script_patches.hpp
@@ -8,7 +8,8 @@ namespace big
 	{
 		g_script_patcher_service->add_patch({ RAGE_JOAAT("freemode"), "2D 01 08 00 ? 38 00 5D ? ? ? 2A 06", 5, {0x71, 0x2E, 0x01, 0x01}, &g.session.decloak_players });
 		g_script_patcher_service->add_patch({ RAGE_JOAAT("freemode"), "2D 01 04 00 ? 2C ? ? ? 5D ? ? ? 71 57 ? ? 2C", 5, { 0x2E, 0x01, 0x00 }, nullptr }); // script host kick
-		g_script_patcher_service->add_patch({ RAGE_JOAAT("freemode"), "2D 00 07 00 00 5D ? ? ? 56 ? ? 71", 5, { 0x2E, 0x00, 0x00 }, &g.tunables.no_idle_kick });
+		g_script_patcher_service->add_patch({ RAGE_JOAAT("freemode"), "2D 00 03 00 00 5D ? ? ? 71 08", 5, { 0x2E, 0x00, 0x00 }, &g.tunables.no_idle_kick });
+		g_script_patcher_service->add_patch({ RAGE_JOAAT("freemode"), "2D 00 03 00 00 5D ? ? ? 56 ? ? 72 2E ? ? 62", 5, { 0x72, 0x2E, 0x00, 0x01 }, &g.tunables.no_idle_kick });
 		g_script_patcher_service->add_patch({ RAGE_JOAAT("freemode"), "5D ? ? ? 76 57 ? ? 5D ? ? ? 76", 0, { 0x2E, 0x00, 0x00 }, nullptr }); // end session kick protection
 		g_script_patcher_service->add_patch({ RAGE_JOAAT("freemode"), "2D 01 09 00 00 5D ? ? ? 56 ? ? 2E", 5, { 0x2E, 0x01, 0x00 }, nullptr }); // disable death when undermap/spectating
 		g_script_patcher_service->add_patch({ RAGE_JOAAT("freemode"), "71 2E ? ? 55 ? ? 61 ? ? ? 47 ? ? 63", 0, { 0x72 }, nullptr });  // load island even if stranded animal IPL choice is not set
diff --git a/src/core/data/all_script_names.hpp b/src/core/data/all_script_names.hpp
new file mode 100644
index 00000000..b5e1ce07
--- /dev/null
+++ b/src/core/data/all_script_names.hpp
@@ -0,0 +1,1028 @@
+#pragma once
+
+namespace big 
+{
+	constexpr const static inline auto all_script_names = std::to_array({
+		"abigail1",
+		"abigail2",
+		"achievement_controller",
+		"act_cinema",
+		//"activity_creator_prototype_launcher",
+		"af_intro_t_sandy",
+		"agency_heist1",
+		"agency_heist2",
+		"agency_heist3a",
+		"agency_heist3b",
+		"agency_prep1",
+		"agency_prep2amb",
+		//"aicover_test",
+		//"ainewengland_test",
+		"altruist_cult",
+		"am_airstrike",
+		"am_ammo_drop",
+		"am_arena_shp",
+		"am_armwrestling_apartment",
+		"am_armwrestling",
+		"am_armybase",
+		"am_backup_heli",
+		"am_beach_washup_cinematic",
+		"am_boat_taxi",
+		"am_bru_box",
+		"am_car_mod_tut",
+		"am_casino_limo",
+		"am_casino_luxury_car",
+		"am_casino_peds",
+		"am_challenges",
+		"am_contact_requests",
+		"am_cp_collection",
+		"am_crate_drop",
+		"am_criminal_damage",
+		"am_darts_apartment",
+		"am_darts",
+		"am_dead_drop",
+		"am_destroy_veh",
+		"am_distract_cops",
+		"am_doors",
+		"am_ferriswheel",
+		"am_ga_pickups",
+		"am_gang_call",
+		"am_heist_int",
+		"am_heli_taxi",
+		"am_hi_plane_land_cinematic",
+		"am_hi_plane_take_off_cinematic",
+		"am_hold_up",
+		"am_hot_property",
+		"am_hot_target",
+		"am_hs4_isd_take_vel",
+		"am_hs4_lsa_land_nimb_arrive",
+		"am_hs4_lsa_land_vel",
+		"am_hs4_lsa_take_vel",
+		"am_hs4_nimb_isd_lsa_leave",
+		"am_hs4_nimb_lsa_isd_arrive",
+		"am_hs4_nimb_lsa_isd_leave",
+		"am_hs4_vel_lsa_isd",
+		"am_hunt_the_beast",
+		"am_imp_exp",
+		"am_island_backup_heli",
+		"am_joyrider",
+		"am_kill_list",
+		"am_king_of_the_castle",
+		"am_launcher",
+		"am_lester_cut",
+		"am_lowrider_int",
+		"am_lsia_take_off_cinematic",
+		"am_mission_launch",
+		"am_mp_arc_cab_manager",
+		"am_mp_arcade_claw_crane",
+		"am_mp_arcade_fortune_teller",
+		"am_mp_arcade_love_meter",
+		"am_mp_arcade_peds",
+		"am_mp_arcade_strength_test",
+		"am_mp_arcade",
+		"am_mp_arena_box",
+		"am_mp_arena_garage",
+		"am_mp_armory_aircraft",
+		"am_mp_armory_truck",
+		"am_mp_auto_shop",
+		"am_mp_biker_warehouse",
+		"am_mp_boardroom_seating",
+		"am_mp_bunker",
+		"am_mp_business_hub",
+		"am_mp_car_meet_property",
+		"am_mp_car_meet_sandbox",
+		"am_mp_carwash_launch",
+		"am_mp_casino_apartment",
+		"am_mp_casino_nightclub",
+		"am_mp_casino_valet_garage",
+		"am_mp_casino",
+		"am_mp_creator_aircraft",
+		"am_mp_creator_trailer",
+		"am_mp_defunct_base",
+		"am_mp_drone",
+		"am_mp_garage_control",
+		"am_mp_hacker_truck",
+		"am_mp_hangar",
+		"am_mp_ie_warehouse",
+		"am_mp_island",
+		"am_mp_nightclub",
+		"am_mp_orbital_cannon",
+		"am_mp_peds",
+		"am_mp_property_ext",
+		"am_mp_property_int",
+		"am_mp_rc_vehicle",
+		"am_mp_shooting_range",
+		"am_mp_smoking_activity",
+		"am_mp_smpl_interior_ext",
+		"am_mp_smpl_interior_int",
+		"am_mp_solomon_office",
+		"am_mp_submarine",
+		"am_mp_vehicle_reward",
+		"am_mp_vehicle_weapon",
+		"am_mp_warehouse",
+		"am_mp_yacht",
+		"am_npc_invites",
+		"am_pass_the_parcel",
+		"am_penned_in",
+		"am_penthouse_peds",
+		"am_pi_menu",
+		"am_plane_takedown",
+		"am_prison",
+		"am_prostitute",
+		"am_rollercoaster",
+		"am_rontrevor_cut",
+		"am_taxi",
+		"am_vehicle_spawn",
+		"ambient_diving",
+		"ambient_mrsphilips",
+		"ambient_solomon",
+		"ambient_sonar",
+		"ambient_tonya",
+		"ambient_tonyacall2",
+		"ambient_tonyacall5",
+		"ambient_tonyacall",
+		"ambient_ufos",
+		"ambientblimp",
+		"animal_controller",
+		"apartment_minigame_launcher",
+		"apparcadebusiness",
+		"apparcadebusinesshub",
+		"appbikerbusiness",
+		"appbroadcast",
+		"appbunkerbusiness",
+		"appbusinesshub",
+		"appcamera",
+		"appchecklist",
+		"appcontacts",
+		"appcovertops",
+		"appemail",
+		"appextraction",
+		"apphackertruck",
+		"apphs_sleep",
+		"appimportexport",
+		"appinternet",
+		"appjipmp",
+		"appmedia",
+		"appmpbossagency",
+		"appmpemail",
+		"appmpjoblistnew",
+		"apporganiser",
+		"apprepeatplay",
+		"appsecurohack",
+		"appsecuroserv",
+		"appsettings",
+		"appsidetask",
+		"appsmuggler",
+		"apptextmessage",
+		"apptrackify",
+		"appvlsi",
+		"appzit",
+		"arcade_seating",
+		"arena_box_bench_seats",
+		"arena_carmod",
+		"arena_workshop_seats",
+		"armenian1",
+		"armenian2",
+		"armenian3",
+		"armory_aircraft_carmod",
+		"assassin_bus",
+		"assassin_construction",
+		"assassin_hooker",
+		"assassin_multi",
+		"assassin_rankup",
+		"assassin_valet",
+		"atm_trigger",
+		//"audiotest",
+		"auto_shop_seating",
+		"autosave_controller",
+		"bailbond1",
+		"bailbond2",
+		"bailbond3",
+		"bailbond4",
+		"bailbond_launcher",
+		"barry1",
+		"barry2",
+		"barry3",
+		"barry3a",
+		"barry3c",
+		"barry4",
+		"base_carmod",
+		"base_corridor_seats",
+		"base_entrance_seats",
+		"base_heist_seats",
+		"base_lounge_seats",
+		"base_quaters_seats",
+		"base_reception_seats",
+		//"basic_creator",
+		"beach_exterior_seating",
+		"benchmark",
+		"bigwheel",
+		"bj",
+		"blackjack",
+		"blimptest",
+		"blip_controller",
+		"bootycall_debug_controller",
+		"bootycallhandler",
+		"buddydeathresponse",
+		//"bugstar_mission_export",
+		"building_controller",
+		"buildingsiteambience",
+		"business_battles_defend",
+		"business_battles_sell",
+		"business_battles",
+		"business_hub_carmod",
+		"business_hub_garage_seats",
+		"cablecar",
+		//"cam_coord_sender",
+		//"camera_test",
+		"camhedz_arcade",
+		"candidate_controller",
+		"car_meet_carmod",
+		"car_meet_exterior_seating",
+		"car_roof_test",
+		"carmod_shop",
+		"carsteal1",
+		"carsteal2",
+		"carsteal3",
+		"carsteal4",
+		"carwash1",
+		"carwash2",
+		"casino_bar_seating",
+		"casino_exterior_seating",
+		"casino_interior_seating",
+		"casino_lucky_wheel",
+		"casino_main_lounge_seating",
+		"casino_nightclub_seating",
+		"casino_penthouse_seating",
+		"casino_slots",
+		"casinoroulette",
+		//"celebration_editor",
+		"celebrations",
+		"cellphone_controller",
+		"cellphone_flashhand",
+		"charactergoals",
+		//"charanimtest",
+		"cheat_controller",
+		"chinese1",
+		"chinese2",
+		"chop",
+		"clothes_shop_mp",
+		"clothes_shop_sp",
+		"code_controller",
+		//"combat_test",
+		"comms_controller",
+		"completionpercentage_controller",
+		"component_checker",
+		"context_controller",
+		"controller_ambientarea",
+		"controller_races",
+		"controller_taxi",
+		"controller_towing",
+		"controller_trafficking",
+		"coordinate_recorder",
+		"country_race_controller",
+		"country_race",
+		"creation_startup",
+		"creator",
+		//"custom_config",
+		//"cutscene_test",
+		//"cutscenemetrics",
+		//"cutscenesamples",
+		"darts",
+		//"debug_app_select_screen",
+		//"debug_clone_outfit_testing",
+		//"debug_launcher",
+		//"debug_ped_data",
+		//"debug",
+		"degenatron_games",
+		//"density_test",
+		"dialogue_handler",
+		"director_mode",
+		"docks2asubhandler",
+		"docks_heista",
+		"docks_heistb",
+		"docks_prep1",
+		"docks_prep2b",
+		"docks_setup",
+		"dont_cross_the_line",
+		"dreyfuss1",
+		"drf1",
+		"drf2",
+		"drf3",
+		"drf4",
+		"drf5",
+		"drunk_controller",
+		"drunk",
+		//"dynamixtest",
+		"email_controller",
+		"emergencycall",
+		"emergencycalllauncher",
+		"epscars",
+		"epsdesert",
+		"epsilon1",
+		"epsilon2",
+		"epsilon3",
+		"epsilon4",
+		"epsilon5",
+		"epsilon6",
+		"epsilon7",
+		"epsilon8",
+		"epsilontract",
+		"epsrobes",
+		"error_listener",
+		//"error_thrower",
+		"event_controller",
+		"exile1",
+		"exile2",
+		"exile3",
+		"exile_city_denial",
+		"extreme1",
+		"extreme2",
+		"extreme3",
+		"extreme4",
+		"fairgroundhub",
+		"fake_interiors",
+		"fame_or_shame_set",
+		"fameorshame_eps_1",
+		"fameorshame_eps",
+		"family1",
+		"family1taxi",
+		"family2",
+		"family3",
+		"family4",
+		"family5",
+		"family6",
+		"family_scene_f0",
+		"family_scene_f1",
+		"family_scene_m",
+		"family_scene_t0",
+		"family_scene_t1",
+		"fanatic1",
+		"fanatic2",
+		"fanatic3",
+		"fbi1",
+		"fbi2",
+		"fbi3",
+		"fbi4_intro",
+		"fbi4_prep1",
+		"fbi4_prep2",
+		"fbi4_prep3",
+		"fbi4_prep3amb",
+		"fbi4_prep4",
+		"fbi4_prep5",
+		"fbi4",
+		"fbi5a",
+		"finale_choice",
+		"finale_credits",
+		"finale_endgame",
+		"finale_heist1",
+		"finale_heist2_intro",
+		"finale_heist2a",
+		"finale_heist2b",
+		"finale_heist_prepa",
+		"finale_heist_prepb",
+		"finale_heist_prepc",
+		"finale_heist_prepd",
+		"finale_heist_prepeamb",
+		"finale_intro",
+		"finalea",
+		"finaleb",
+		"finalec1",
+		"finalec2",
+		"floating_help_controller",
+		"flow_autoplay",
+		"flow_controller",
+		"flow_help",
+		"flowintrotitle",
+		"flowstartaccept",
+		"flyunderbridges",
+		"fm_bj_race_controler",
+		"fm_capture_creator",
+		"fm_content_auto_shop_delivery",
+		"fm_content_business_battles",
+		"fm_content_drug_vehicle",
+		"fm_content_golden_gun",
+		"fm_content_island_dj",
+		"fm_content_island_heist",
+		"fm_content_movie_props",
+		"fm_content_phantom_car",
+		"fm_content_sightseeing",
+		"fm_content_slasher",
+		"fm_content_tuner_robbery",
+		"fm_content_vehicle_list",
+		"fm_deathmatch_controler",
+		"fm_deathmatch_creator",
+		"fm_hideout_controler",
+		"fm_hold_up_tut",
+		"fm_horde_controler",
+		"fm_impromptu_dm_controler",
+		"fm_intro_cut_dev",
+		"fm_intro",
+		"fm_lts_creator",
+		"fm_main_menu",
+		"fm_maintain_cloud_header_data",
+		"fm_maintain_transition_players",
+		"fm_mission_controller_2020",
+		"fm_mission_controller",
+		//"fm_mission_creator",
+		"fm_race_controler",
+		"fm_race_creator",
+		"fm_survival_controller",
+		"fm_survival_creator",
+		"fmmc_launcher",
+		"fmmc_playlist_controller",
+		"forsalesigns",
+		//"fps_test_mag",
+		//"fps_test",
+		"franklin0",
+		"franklin1",
+		"franklin2",
+		"freemode_clearglobals",
+		"freemode_creator",
+		"freemode_init",
+		"freemode",
+		"friendactivity",
+		"friends_controller",
+		"friends_debug_controller",
+		//"fullmap_test_flow",
+		//"fullmap_test",
+		//"game_server_test",
+		"gb_airfreight",
+		"gb_amphibious_assault",
+		"gb_assault",
+		"gb_bank_job",
+		"gb_bellybeast",
+		"gb_biker_bad_deal",
+		"gb_biker_burn_assets",
+		"gb_biker_contraband_defend",
+		"gb_biker_contraband_sell",
+		"gb_biker_contract_killing",
+		"gb_biker_criminal_mischief",
+		"gb_biker_destroy_vans",
+		"gb_biker_driveby_assassin",
+		"gb_biker_free_prisoner",
+		"gb_biker_joust",
+		"gb_biker_last_respects",
+		"gb_biker_race_p2p",
+		"gb_biker_rescue_contact",
+		"gb_biker_rippin_it_up",
+		"gb_biker_safecracker",
+		"gb_biker_search_and_destroy",
+		"gb_biker_shuttle",
+		"gb_biker_stand_your_ground",
+		"gb_biker_steal_bikes",
+		"gb_biker_target_rival",
+		"gb_biker_unload_weapons",
+		"gb_biker_wheelie_rider",
+		"gb_carjacking",
+		"gb_cashing_out",
+		"gb_casino_heist_planning",
+		"gb_casino_heist",
+		"gb_casino",
+		"gb_collect_money",
+		"gb_contraband_buy",
+		"gb_contraband_defend",
+		"gb_contraband_sell",
+		"gb_data_hack",
+		"gb_deathmatch",
+		"gb_delivery",
+		"gb_finderskeepers",
+		"gb_fivestar",
+		"gb_fortified",
+		"gb_fragile_goods",
+		"gb_fully_loaded",
+		"gb_gang_ops_planning",
+		"gb_gangops",
+		"gb_gunrunning_defend",
+		"gb_gunrunning_delivery",
+		"gb_gunrunning",
+		"gb_headhunter",
+		"gb_hunt_the_boss",
+		"gb_ie_delivery_cutscene",
+		"gb_illicit_goods_resupply",
+		"gb_infiltration",
+		"gb_jewel_store_grab",
+		"gb_ploughed",
+		"gb_point_to_point",
+		"gb_ramped_up",
+		"gb_rob_shop",
+		"gb_salvage",
+		"gb_security_van",
+		"gb_sightseer",
+		"gb_smuggler",
+		"gb_stockpiling",
+		"gb_target_pursuit",
+		"gb_terminate",
+		"gb_transporter",
+		"gb_vehicle_export",
+		"gb_velocity",
+		"gb_yacht_rob",
+		"general_test",
+		"ggsm_arcade",
+		"globals_fmmc_struct_registration",
+		"globals_fmmcstruct2_registration",
+		"golf_ai_foursome_putting",
+		"golf_ai_foursome",
+		"golf_mp",
+		"golf",
+		"gpb_andymoon",
+		"gpb_baygor",
+		"gpb_billbinder",
+		"gpb_clinton",
+		"gpb_griff",
+		"gpb_jane",
+		"gpb_jerome",
+		"gpb_jesse",
+		"gpb_mani",
+		"gpb_mime",
+		"gpb_pameladrake",
+		"gpb_superhero",
+		"gpb_tonya",
+		"gpb_zombie",
+		"grid_arcade_cabinet",
+		//"gtest_airplane",
+		//"gtest_avoidance",
+		//"gtest_boat",
+		//"gtest_divingfromcar",
+		//"gtest_divingfromcarwhilefleeing",
+		//"gtest_helicopter",
+		//"gtest_nearlymissedbycar",
+		"gunclub_shop",
+		"gunfighttest",
+		"gunslinger_arcade",
+		"hacker_truck_carmod",
+		"hairdo_shop_mp",
+		"hairdo_shop_sp",
+		"hangar_carmod",
+		"hao1",
+		//"headertest",
+		//"heatmap_test_flow",
+		//"heatmap_test",
+		"heist_ctrl_agency",
+		"heist_ctrl_docks",
+		"heist_ctrl_finale",
+		"heist_ctrl_jewel",
+		"heist_ctrl_rural",
+		"heist_island_planning",
+		"heli_gun",
+		"heli_streaming",
+		//"hud_creator",
+		"hunting1",
+		"hunting2",
+		"hunting_ambient",
+		"idlewarper",
+		"ingamehud",
+		"initial",
+		"jewelry_heist",
+		"jewelry_prep1a",
+		"jewelry_prep1b",
+		"jewelry_prep2a",
+		"jewelry_setup1",
+		"josh1",
+		"josh2",
+		"josh3",
+		"josh4",
+		"lamar1",
+		"laptop_trigger",
+		"launcher_abigail",
+		"launcher_barry",
+		"launcher_basejumpheli",
+		"launcher_basejumppack",
+		"launcher_carwash",
+		"launcher_darts",
+		"launcher_dreyfuss",
+		"launcher_epsilon",
+		"launcher_extreme",
+		"launcher_fanatic",
+		"launcher_golf",
+		"launcher_hao",
+		"launcher_hunting_ambient",
+		"launcher_hunting",
+		"launcher_josh",
+		"launcher_maude",
+		"launcher_minute",
+		"launcher_mrsphilips",
+		"launcher_nigel",
+		"launcher_offroadracing",
+		"launcher_omega",
+		"launcher_paparazzo",
+		"launcher_pilotschool",
+		"launcher_racing",
+		"launcher_rampage",
+		"launcher_range",
+		"launcher_stunts",
+		"launcher_tennis",
+		"launcher_thelastone",
+		"launcher_tonya",
+		"launcher_triathlon",
+		"launcher_yoga",
+		"lester1",
+		"lesterhandler",
+		"letterscraps",
+		//"line_activation_test",
+		"liverecorder",
+		//"locates_tester",
+		"luxe_veh_activity",
+		//"magdemo2",
+		//"magdemo",
+		"main_install",
+		"main_persistent",
+		"main",
+		"maintransition",
+		"martin1",
+		"maude1",
+		"maude_postbailbond",
+		"me_amanda1",
+		"me_jimmy1",
+		"me_tracey1",
+		"mg_race_to_point",
+		"michael1",
+		"michael2",
+		"michael3",
+		"michael4",
+		"michael4leadout",
+		"minigame_ending_stinger",
+		"minigame_stats_tracker",
+		"minute1",
+		"minute2",
+		"minute3",
+		"mission_race",
+		"mission_repeat_controller",
+		"mission_stat_alerter",
+		"mission_stat_watcher",
+		"mission_triggerer_a",
+		"mission_triggerer_b",
+		"mission_triggerer_c",
+		"mission_triggerer_d",
+		"missioniaaturret",
+		"mp_awards",
+		"mp_bed_high",
+		"mp_fm_registration",
+		"mp_menuped",
+		"mp_prop_global_block",
+		"mp_prop_special_global_block",
+		"mp_registration",
+		"mp_save_game_global_block",
+		"mp_unlocks",
+		"mp_weapons",
+		"mpstatsinit",
+		//"mptestbed",
+		"mrsphilips1",
+		"mrsphilips2",
+		"murdermystery",
+		"navmeshtest",
+		//"net_activity_creator_ui",
+		//"net_apartment_activity_light",
+		//"net_apartment_activity",
+		//"net_bot_brain",
+		//"net_bot_simplebrain",
+		//"net_cloud_mission_loader",
+		//"net_combat_soaktest",
+		//"net_jacking_soaktest",
+		//"net_rank_tunable_loader",
+		//"net_session_soaktest",
+		//"net_tunable_check",
+		"nigel1",
+		"nigel1a",
+		"nigel1b",
+		"nigel1c",
+		"nigel1d",
+		"nigel2",
+		"nigel3",
+		"nightclub_ground_floor_seats",
+		"nightclub_office_seats",
+		"nightclub_vip_seats",
+		"nightclubpeds",
+		//"nodemenututorial",
+		//"nodeviewer",
+		"ob_abatdoor",
+		"ob_abattoircut",
+		"ob_airdancer",
+		"ob_bong",
+		"ob_cashregister",
+		"ob_drinking_shots",
+		"ob_foundry_cauldron",
+		"ob_franklin_beer",
+		"ob_franklin_tv",
+		"ob_franklin_wine",
+		"ob_huffing_gas",
+		"ob_jukebox",
+		"ob_mp_bed_high",
+		"ob_mp_bed_low",
+		"ob_mp_bed_med",
+		"ob_mp_shower_med",
+		"ob_mp_stripper",
+		"ob_mr_raspberry_jam",
+		"ob_poledancer",
+		"ob_sofa_franklin",
+		"ob_sofa_michael",
+		"ob_telescope",
+		"ob_tv",
+		"ob_vend1",
+		"ob_vend2",
+		"ob_wheatgrass",
+		"offroad_races",
+		"omega1",
+		"omega2",
+		"paparazzo1",
+		"paparazzo2",
+		"paparazzo3",
+		"paparazzo3a",
+		"paparazzo3b",
+		"paparazzo4",
+		"paradise2",
+		"paradise",
+		//"pausemenu_example",
+		"pausemenu_map",
+		"pausemenu_multiplayer",
+		"pausemenu_sp_repeat",
+		"pausemenu",
+		"pb_busker",
+		"pb_homeless",
+		"pb_preacher",
+		"pb_prostitute",
+		"personal_carmod_shop",
+		"photographymonkey",
+		"photographywildlife",
+		//"physics_perf_test_launcher",
+		//"physics_perf_test",
+		"pi_menu",
+		"pickup_controller",
+		//"pickuptest",
+		"pickupvehicles",
+		"pilot_school_mp",
+		"pilot_school",
+		"placeholdermission",
+		//"placementtest",
+		//"planewarptest",
+		"player_controller_b",
+		"player_controller",
+		"player_scene_f_lamgraff",
+		"player_scene_f_lamtaunt",
+		"player_scene_f_taxi",
+		"player_scene_ft_franklin1",
+		"player_scene_m_cinema",
+		"player_scene_m_fbi2",
+		"player_scene_m_kids",
+		"player_scene_m_shopping",
+		"player_scene_mf_traffic",
+		"player_scene_t_bbfight",
+		"player_scene_t_chasecar",
+		"player_scene_t_insult",
+		"player_scene_t_park",
+		"player_scene_t_tie",
+		"player_timetable_scene",
+		//"playthrough_builder",
+		"pm_defend",
+		"pm_delivery",
+		"pm_gang_attack",
+		"pm_plane_promotion",
+		"pm_recover_stolen",
+		"postkilled_bailbond2",
+		"postrc_barry1and2",
+		"postrc_barry4",
+		"postrc_epsilon4",
+		"postrc_nigel3",
+		"profiler_registration",
+		"prologue1",
+		//"prop_drop",
+		"puzzle",
+		//"racetest",
+		"rampage1",
+		"rampage2",
+		"rampage3",
+		"rampage4",
+		"rampage5",
+		"rampage_controller",
+		"randomchar_controller",
+		"range_modern_mp",
+		"range_modern",
+		"re_abandonedcar",
+		"re_accident",
+		"re_armybase",
+		"re_arrests",
+		"re_atmrobbery",
+		"re_bikethief",
+		"re_border",
+		"re_burials",
+		"re_bus_tours",
+		"re_cartheft",
+		"re_chasethieves",
+		"re_crashrescue",
+		"re_cultshootout",
+		"re_dealgonewrong",
+		"re_domestic",
+		"re_drunkdriver",
+		"re_duel",
+		"re_gang_intimidation",
+		"re_gangfight",
+		"re_getaway_driver",
+		"re_hitch_lift",
+		"re_homeland_security",
+		"re_lossantosintl",
+		"re_lured",
+		"re_monkey",
+		"re_mountdance",
+		"re_muggings",
+		"re_paparazzi",
+		"re_prison",
+		"re_prisonerlift",
+		"re_prisonvanbreak",
+		"re_rescuehostage",
+		"re_seaplane",
+		"re_securityvan",
+		"re_shoprobbery",
+		"re_snatched",
+		"re_stag_do",
+		"re_yetarian",
+		"replay_controller",
+		"rerecord_recording",
+		"respawn_controller",
+		"restrictedareas",
+		//"rng_output",
+		"road_arcade",
+		"rollercoaster",
+		"rural_bank_heist",
+		"rural_bank_prep1",
+		"rural_bank_setup",
+		"save_anywhere",
+		"savegame_bed",
+		"sc_lb_global_block",
+		//"scaleformgraphictest",
+		//"scaleformminigametest",
+		//"scaleformprofiling",
+		//"scaleformtest",
+		//"scene_builder",
+		"sclub_front_bouncer",
+		//"script_metrics",
+		//"scripted_cam_editor",
+		//"scriptplayground",
+		//"scripttest1",
+		//"scripttest2",
+		//"scripttest3",
+		//"scripttest4",
+		"scroll_arcade_cabinet",
+		"sctv",
+		//"selector_example",
+		"selector",
+		"selling_short_1",
+		"selling_short_2",
+		"sh_intro_f_hills",
+		"sh_intro_m_home",
+		//"shooting_camera",
+		"shop_controller",
+		"shoprobberies",
+		"shot_bikejump",
+		"shrinkletter",
+		//"smoketest",
+		"social_controller",
+		"solomon1",
+		"solomon2",
+		"solomon3",
+		"sp_dlc_registration",
+		//"sp_editor_mission_instance",
+		"sp_menuped",
+		"sp_pilotschool_reg",
+		"spaceshipparts",
+		"spawn_activities",
+		"speech_reverb_tracker",
+		"spmc_instancer",
+		"spmc_preloader",
+		"standard_global_init",
+		"standard_global_reg",
+		"startup_install",
+		"startup_locationtest",
+		"startup_positioning",
+		"startup_smoketest",
+		"startup",
+		"stats_controller",
+		"stock_controller",
+		"streaming",
+		"stripclub_drinking",
+		"stripclub_mp",
+		"stripclub",
+		"stripperhome",
+		"stunt_plane_races",
+		"tasklist_1",
+		"tattoo_shop",
+		"taxi_clowncar",
+		"taxi_cutyouin",
+		"taxi_deadline",
+		"taxi_followcar",
+		"taxi_gotyounow",
+		"taxi_gotyourback",
+		"taxi_needexcitement",
+		"taxi_procedural",
+		"taxi_takeiteasy",
+		"taxi_taketobest",
+		"taxilauncher",
+		"taxiservice",
+		"taxitutorial",
+		//"tempalpha",
+		//"temptest",
+		"tennis_ambient",
+		"tennis_family",
+		"tennis_network_mp",
+		"tennis",
+		"test_startup",
+		"thelastone",
+		"three_card_poker",
+		"timershud",
+		"title_update_registration_2",
+		"title_update_registration",
+		"tonya1",
+		"tonya2",
+		"tonya3",
+		"tonya4",
+		"tonya5",
+		"towing",
+		"traffick_air",
+		"traffick_ground",
+		"traffickingsettings",
+		"traffickingteleport",
+		//"train_create_widget",
+		//"train_tester",
+		"trevor1",
+		"trevor2",
+		"trevor3",
+		"trevor4",
+		"triathlonsp",
+		"tunables_registration",
+		"tuneables_processing",
+		"tuner_planning",
+		"tuner_property_carmod",
+		"tuner_sandbox_activity",
+		"turret_cam_script",
+		"ufo",
+		"ugc_global_registration",
+		"underwaterpickups",
+		//"utvc",
+		"valentinerpreward2",
+		"veh_play_widget",
+		//"vehicle_ai_test",
+		//"vehicle_force_widget",
+		"vehicle_gen_controller",
+		//"vehicle_plate",
+		"vehicle_stealth_mode",
+		"vehiclespawning",
+		//"walking_ped",
+		"wardrobe_mp",
+		"wardrobe_sp",
+		//"weapon_audio_widget",
+		"wizard_arcade",
+		"wp_partyboombox",
+		//"xml_menus",
+		"yoga",
+
+		// 1.58 Contract DLC
+
+		"am_agency_suv",
+		"am_mp_fixer_hq",
+		"am_mp_music_studio",
+		"appfixersecurity",
+		"fixer_hq_carmod",
+		"fixer_hq_seating_op_floor",
+		"fixer_hq_seating_pq",
+		"fixer_hq_seating",
+		"fm_content_payphone_hit",
+		"fm_content_payphone_intro",
+		"fm_content_security_contract",
+		"fm_content_vip_contract_1",
+		"music_studio_seating_external",
+		"music_studio_seating",
+		"music_studio_smoking",
+		"ugc_global_registration_2",
+
+		// 1.59 Next Gen Patch
+
+		"car_meet_interior_seating",
+		"fm_content_hsw_setup",
+		"fm_content_hsw_time_trial",
+		"fm_content_mp_intro",
+		"landing_pre_startup",
+
+		// 1.61
+
+		"am_luxury_showroom",
+		"am_mp_simeon_showroom",
+		"fm_content_ammunation",
+		"fm_content_bar_resupply",
+		"fm_content_bike_shop_delivery",
+		"fm_content_cargo",
+		"fm_content_cerberus",
+		"fm_content_club_management",
+		"fm_content_club_odd_jobs",
+		"fm_content_club_source",
+		"fm_content_clubhouse_contracts",
+		"fm_content_crime_scene",
+		"fm_content_export_cargo",
+		"fm_content_gunrunning",
+		"fm_content_metal_detector",
+		"fm_content_parachuter",
+		"fm_content_skydive",
+		"fm_content_smuggler_plane",
+		"fm_content_smuggler_trail",
+		"fm_content_source_research",
+		"net_test_drive",
+		"simeon_showroom_seating"
+	});
+}
\ No newline at end of file
diff --git a/src/core/data/packet_types.hpp b/src/core/data/packet_types.hpp
index 322564aa..b532e0c2 100644
--- a/src/core/data/packet_types.hpp
+++ b/src/core/data/packet_types.hpp
@@ -42,7 +42,7 @@ inline const static constexpr std::pair<const char*, std::uint32_t> packet_types
     { "MsgScriptHostRequest", 0x67 },
     { "MsgScriptHandshakeAck", 0x5B },
     { "MsgScriptHandshake", 0x57 },
-    { "MsgScriptBotLeave", 0x2 },
+    { "MsgScriptBotLeave", 0x2B },
     { "MsgScriptBotJoinAck", 0x63 },
     { "MsgScriptBotJoin", 0x1C },
     { "MsgScriptBotHandshakeAck", 0x31 },
diff --git a/src/core/data/stack_sizes.hpp b/src/core/data/stack_sizes.hpp
new file mode 100644
index 00000000..34f848c1
--- /dev/null
+++ b/src/core/data/stack_sizes.hpp
@@ -0,0 +1,36 @@
+#pragma once
+
+namespace big
+{
+	constexpr inline static const std::pair<const char*, int> stack_sizes[] =
+	{
+		{ "MICRO", 128 },
+		{ "MINI", 512 },
+		{ "DEFAULT", 1424 },
+		{ "SPECIAL_ABILITY", 1828 },
+		{ "FRIEND", 2050 },
+		{ "SHOP", 2324 },
+		{ "CELLPHONE", 2552 },
+		{ "VEHICLE_SPAWN", 3568 },
+		{ "CAR_MOD_SHOP", 3650 },
+		{ "PAUSE_MENU_SCRIPT", 3076 },
+		{ "APP_INTERNET", 4592 },
+		{ "MULTIPLAYER_MISSION", 5050 },
+		{ "CONTACTS_APP", 4000 },
+		{ "INTERACTION_MENU", 9800 },
+		{ "SCRIPT_XML", 8344 },
+		{ "PROPERTY_INT", 19400 },
+		{ "ACTIVITY_CREATOR_INT", 15900 },
+		{ "SMPL_INTERIOR", 2512 },
+		{ "WAREHOUSE", 14100 },
+		{ "IE_DELIVERY", 2324 },
+		{ "SHOP_CONTROLLER", 3800 },
+		{ "AM_MP_YACHT", 5000 },
+		{ "INGAMEHUD", 4600 },
+		{ "TRANSITION", 8032 },
+		{ "FMMC_LAUNCHER", 24000 },
+		{ "MULTIPLAYER_FREEMODE", 72500 },
+		{ "MISSION", 54000 },
+		{ "MP_LAUNCH_SCRIPT", 33750 },
+	};
+}
\ No newline at end of file
diff --git a/src/core/globals.hpp b/src/core/globals.hpp
index 6f0ecfa0..ababe98c 100644
--- a/src/core/globals.hpp
+++ b/src/core/globals.hpp
@@ -475,6 +475,8 @@ namespace big
 
 		struct spoofing
 		{
+			bool hide_from_player_list = false;
+
 			bool spoof_cheater = false;
 
 			bool spoof_hide_god = true;
@@ -493,7 +495,7 @@ namespace big
 			int session_player_count = 25;
 
 			NLOHMANN_DEFINE_TYPE_INTRUSIVE(spoofing,
-				spoof_cheater, spoof_hide_god, spoof_hide_spectate, spoof_crew_data, crew_tag, rockstar_crew,
+				hide_from_player_list, spoof_cheater, spoof_hide_god, spoof_hide_spectate, spoof_crew_data, crew_tag, rockstar_crew,
 				square_crew_tag, spoof_session_region_type, session_region_type, spoof_session_language,
 				session_language, spoof_session_player_count, session_player_count)
 		} spoofing{};
diff --git a/src/core/scr_globals.hpp b/src/core/scr_globals.hpp
index e5a58b94..f5a7c74d 100644
--- a/src/core/scr_globals.hpp
+++ b/src/core/scr_globals.hpp
@@ -15,12 +15,13 @@ namespace big::scr_globals
 	static inline script_global gsbd_kicking(1885209);
 	static inline script_global gsbd_fm_events(1923597);
 	static inline script_global gsbd_block_c(2652258);
+	static inline script_global gsbd_property_instances(1943595);
 
 	static inline script_global globalplayer_bd(2657589);
 	static inline script_global gpbd_fm_3(1894573);
 	static inline script_global gpbd_fm_1(1853910);
 
-	static inline script_global launcher_global(2756257);
+	static inline script_global launcher_global(2756259);
 
 	static inline script_global sp(113648);
 	static inline script_global mission_definition(91469);
diff --git a/src/gta/script_handler.hpp b/src/gta/script_handler.hpp
index 5b84574e..f7d4c36e 100644
--- a/src/gta/script_handler.hpp
+++ b/src/gta/script_handler.hpp
@@ -140,11 +140,7 @@ namespace rage
 		virtual std::int32_t _0x70() = 0;                                                       // 14 (0x70)
 		virtual void* _0x78() = 0;                                                              // 15 (0x78)
 	public:
-		char m_padding1[0x28];                         // 0x08
-		bool m_initialized;                            // 0x30
-		bool m_initialized2;                           // 0x31
-		char m_padding2[0x0E];                         // 0x32
-		rage::netLoggingInterface* m_logger;           // 0x40
+		char pad_0008[104];
 	};
 }
 
@@ -175,10 +171,6 @@ public:
 	std::uint8_t m_0xAF;        // 0xAF
 };
 
-class CGameScriptHandlerMgr : public rage::scriptHandlerMgr
-{
-};
-
 class CScriptParticipant
 {
 public:
@@ -310,6 +302,42 @@ public:
 }; //Size: 0x01B0
 static_assert(sizeof(CGameScriptHandlerNetComponent) == 0x1B0);
 
+class CRemoteScriptInfo : public CGameScriptId
+{
+public:
+	uint32_t m_participants; //0x0040
+	char pad_0044[4]; //0x0044
+	class CNetGamePlayer* m_host; //0x0048
+	uint32_t m_timestamp_2; //0x0050
+	uint16_t m_host_token; //0x0054
+	uint8_t m_reserved_peds; //0x0056
+	uint8_t m_reserved_vehicles; //0x0057
+	uint8_t m_reserved_objects; //0x0058
+	uint8_t m_reserved_unk1; //0x0059
+	uint8_t m_reserved_unk2; //0x005A
+	uint8_t m_reserved_unk3; //0x005B
+	uint8_t m_reserved_unk4; //0x005C
+	char pad_005D[3]; //0x005D
+}; //Size: 0x0060
+static_assert(sizeof(CRemoteScriptInfo) == 0x60);
+
+class CGameScriptHandlerMgr : public rage::scriptHandlerMgr
+{
+public:
+	char pad_0070[56]; //0x0070
+	class CRemoteScriptInfo m_remote_script_infos[320]; //0x00A8
+	char pad_78A8[4]; //0x78A8
+	uint32_t m_remote_script_start_idx; //0x78AC
+	uint32_t m_remote_script_count; //0x78B0
+	char pad_78B4[4]; //0x78B4
+	class CRemoteScriptInfo m_detached_remote_script_infos[64]; //0x78B8
+	char pad_90B8[4]; //0x90B8
+	uint32_t m_detached_remote_script_start_idx; //0x90BC
+	uint32_t m_detached_remote_script_count; //0x90C0
+	char pad_90C4[28]; //0x90C4
+}; //Size: 0x90E0
+static_assert(sizeof(CGameScriptHandlerMgr) == 0x90E0);
+
 
 static_assert(sizeof(rage::scriptHandler) == 0x60);
 static_assert(sizeof(CGameScriptHandler) == 0xA0);
diff --git a/src/gta_util.hpp b/src/gta_util.hpp
index fcae1f62..6c544669 100644
--- a/src/gta_util.hpp
+++ b/src/gta_util.hpp
@@ -55,23 +55,29 @@ namespace big::gta_util
 	}
 
 	template <typename F, typename ...Args>
-	void execute_as_script(rage::joaat_t script_hash, F &&callback, Args &&...args)
+	void execute_as_script(rage::scrThread* thread, F&& callback, Args &&...args)
 	{
 		auto tls_ctx = rage::tlsContext::get();
+		auto og_thread = tls_ctx->m_script_thread;
+
+		tls_ctx->m_script_thread = thread;
+		tls_ctx->m_is_script_thread_active = true;
+
+		std::invoke(std::forward<F>(callback), std::forward<Args>(args)...);
+
+		tls_ctx->m_script_thread = og_thread;
+		tls_ctx->m_is_script_thread_active = og_thread != nullptr;
+	}
+
+	template <typename F, typename ...Args>
+	void execute_as_script(rage::joaat_t script_hash, F &&callback, Args &&...args)
+	{
 		for (auto thread : *g_pointers->m_script_threads)
 		{
 			if (!thread || !thread->m_context.m_thread_id || thread->m_context.m_script_hash != script_hash)
 				continue;
 
-			auto og_thread = tls_ctx->m_script_thread;
-
-			tls_ctx->m_script_thread = thread;
-			tls_ctx->m_is_script_thread_active = true;
-
-			std::invoke(std::forward<F>(callback), std::forward<Args>(args)...);
-
-			tls_ctx->m_script_thread = og_thread;
-			tls_ctx->m_is_script_thread_active = og_thread != nullptr;
+			execute_as_script(thread, callback, args...);
 
 			return;
 		}
@@ -93,6 +99,21 @@ namespace big::gta_util
 		return nullptr;
 	}
 
+	inline GtaThread* find_script_thread_by_id(std::uint32_t id)
+	{
+		for (auto thread : *g_pointers->m_script_threads)
+		{
+			if (thread
+				&& thread->m_handler
+				&& thread->m_context.m_thread_id == id)
+			{
+				return thread;
+			}
+		}
+
+		return nullptr;
+	}
+
 	inline rage::scrProgram* find_script_program(rage::joaat_t hash)
 	{
 		for (auto& script : *g_pointers->m_script_program_table)
diff --git a/src/hooking.cpp b/src/hooking.cpp
index dbc82a4e..277b7e3d 100644
--- a/src/hooking.cpp
+++ b/src/hooking.cpp
@@ -102,6 +102,8 @@ namespace big
 
 		detour_hook_helper::add<hooks::receive_pickup>("RPI", g_pointers->m_receive_pickup);
 
+		detour_hook_helper::add<hooks::write_player_camera_data_node>("WPCDN", g_pointers->m_write_player_camera_data_node);
+
 		g_hooking = this;
 	}
 
diff --git a/src/hooking.hpp b/src/hooking.hpp
index 9d2dabd4..a699b09f 100644
--- a/src/hooking.hpp
+++ b/src/hooking.hpp
@@ -12,6 +12,7 @@ class CPlayerGameStateDataNode;
 class CPedInventoryDataNode;
 class CDynamicEntityGameStateDataNode;
 class CVehicleGadgetDataNode;
+class CPlayerCameraDataNode;
 class CJoinRequestContext;
 class SessionSortEntry;
 class RemoteGamerInfoMsg;
@@ -147,7 +148,9 @@ namespace big
 		static bool received_array_update(rage::netArrayHandlerBase* array, CNetGamePlayer* sender, rage::datBitBuffer* buffer, int size, std::int16_t cycle);
 
 		static bool receive_pickup(rage::netObject* netobject, void* unk, CPed* ped);
-	};
+
+		static bool write_player_camera_data_node(rage::netObject* player, CPlayerCameraDataNode* node);
+};
 
 	class minhook_keepalive
 	{
diff --git a/src/hooks/protections/can_apply_data.cpp b/src/hooks/protections/can_apply_data.cpp
index b159de61..47db27e8 100644
--- a/src/hooks/protections/can_apply_data.cpp
+++ b/src/hooks/protections/can_apply_data.cpp
@@ -319,10 +319,12 @@ namespace big
 
 	bool hooks::can_apply_data(rage::netSyncTree* tree, rage::netObject* object)
 	{
+#if 0
 		if (tree->m_child_node_count && check_node(tree->m_sync_node, g.m_syncing_player, object))
 		{
 			return false;
 		}
+#endif
 
 		return g_hooking->get_original<hooks::can_apply_data>()(tree, object);
 	}
diff --git a/src/hooks/protections/receive_net_message.cpp b/src/hooks/protections/receive_net_message.cpp
index ba350d0f..1bbbf91f 100644
--- a/src/hooks/protections/receive_net_message.cpp
+++ b/src/hooks/protections/receive_net_message.cpp
@@ -93,36 +93,6 @@ namespace big
 		if (!get_msg_type(msgType, buffer))
 			return g_hooking->get_original<hooks::receive_net_message>()(netConnectionManager, a2, frame);
 
-		if ((msgType == rage::eNetMessage::MsgTransitionLaunchNotify && frame->m_connection_identifier != gta_util::get_network()->m_game_session.m_connection_identifier) ||
-			(msgType == rage::eNetMessage::MsgTransitionLaunch && frame->m_connection_identifier != gta_util::get_network()->m_transition_session.m_connection_identifier))
-		{
-			if (player)
-			{
-				g_notification_service->push_error("PROTECTIONS"_T.data(),
-					std::vformat("REMOTE_CRASH_INVALID_TRANSITION_FROM"_T, std::make_format_args(player->get_name())));
-			}
-			else
-			{
-				g_notification_service->push_error("PROTECTIONS"_T.data(), "REMOTE_CRASH_INVALID_TRANSITION"_T.data());
-			}
-
-			return true;
-		}
-
-		if (msgType == rage::eNetMessage::MsgBlacklist && frame->m_connection_identifier != gta_util::get_network()->m_game_session.m_connection_identifier)
-		{
-			if (player)
-			{
-				g_notification_service->push_error("PROTECTIONS"_T.data(),
-					std::vformat("REMOTE_CRASH_INVALID_BLACKLIST_FROM"_T, std::make_format_args(player->get_name())));
-			}
-			else
-			{
-				g_notification_service->push_error("PROTECTIONS"_T.data(), "REMOTE_CRASH_INVALID_BLACKLIST"_T.data());
-			}
-			return true;
-		}
-
 		if (player)
 		{
 			switch (msgType)
@@ -251,26 +221,6 @@ namespace big
 					else
 						return true;
 				}
-				case rage::eNetMessage::MsgSessionEstablished:
-				{
-#if 0
-					rage::rlGamerHandle handle{ 0 };
-					if (player->get_net_data())
-					{
-						uint64_t session_id;
-						buffer.ReadQWord(&session_id, 64);
-						gamer_handle_deserialize(handle, buffer);
-						if (session_id == gta_util::get_network()->m_game_session_ptr->m_rline_session.m_session_id)
-						{
-							if (handle.m_rockstar_id != player->get_net_data()->m_gamer_handle.m_rockstar_id)
-							{
-								session::add_infraction(player, Infraction::SPOOFED_ROCKSTAR_ID); // TODO: store this RID
-							}
-						}
-					}
-#endif
-					break;
-				}
 				case rage::eNetMessage::MsgNetComplaint:
 				{
 					uint64_t host_token{};
diff --git a/src/hooks/protections/received_event.cpp b/src/hooks/protections/received_event.cpp
index a4ee0fbd..a41e4b54 100644
--- a/src/hooks/protections/received_event.cpp
+++ b/src/hooks/protections/received_event.cpp
@@ -470,7 +470,7 @@ namespace big
 		case eNetworkEvents::REQUEST_CONTROL_EVENT:
 		{
 			int net_id = buffer->Read<int>(13);
-			if (g_local_player && g_local_player->m_vehicle && g_local_player->m_vehicle->m_net_object && g_local_player->m_vehicle->m_net_object->m_object_id == net_id)
+			if (g_local_player && g_local_player->m_vehicle && g_local_player->m_vehicle->m_net_object && g_local_player->m_vehicle->m_net_object->m_object_id == net_id && g_local_player->m_vehicle->m_driver == g_local_player)
 			{
 				g_pointers->m_send_event_ack(event_manager, source_player, target_player, event_index, event_handled_bitset);
 				g.reactions.request_control_event.process(plyr);
diff --git a/src/hooks/script/script_vm.cpp b/src/hooks/script/script_vm.cpp
index abd149e1..230d9c2f 100644
--- a/src/hooks/script/script_vm.cpp
+++ b/src/hooks/script/script_vm.cpp
@@ -3,6 +3,13 @@
 
 #include "services/script_patcher/script_patcher_service.hpp"
 
+#include "pointers.hpp"
+#include "core/scr_globals.hpp"
+#include <script/globals/GlobalPlayerBD.hpp>
+
+static int old_cayo_flags;
+static int old_shop_index;
+
 namespace big
 {
 	class script_vm_guard
@@ -18,11 +25,29 @@ namespace big
 
 			if (auto bytecode = g_script_patcher_service->get_script_bytecode(program->m_name_hash))
 				program->m_code_blocks = bytecode;
+
+			if (g_pointers->m_script_globals[0xA])
+			{
+				scr_globals::globalplayer_bd.as<GlobalPlayerBD*>()->Entries[self::id].CurrentShopIndex = old_shop_index;
+				scr_globals::globalplayer_bd.as<GlobalPlayerBD*>()->Entries[self::id].CayoPericoFlags = old_cayo_flags;
+			}
 		}
 
 		~script_vm_guard()
 		{
 			m_program->m_code_blocks = m_orig_bytecode;
+
+			if (g_pointers->m_script_globals[0xA])
+			{
+				old_shop_index = scr_globals::globalplayer_bd.as<GlobalPlayerBD*>()->Entries[self::id].CurrentShopIndex;
+				old_cayo_flags = scr_globals::globalplayer_bd.as<GlobalPlayerBD*>()->Entries[self::id].CayoPericoFlags;
+
+				if (g.spoofing.hide_from_player_list)
+				{
+					scr_globals::globalplayer_bd.as<GlobalPlayerBD*>()->Entries[self::id].CurrentShopIndex = -1;
+					scr_globals::globalplayer_bd.as<GlobalPlayerBD*>()->Entries[self::id].CayoPericoFlags = 1;
+				}
+			}
 		}
 	};
 
diff --git a/src/hooks/spoofing/write_player_camera_data_node.cpp b/src/hooks/spoofing/write_player_camera_data_node.cpp
new file mode 100644
index 00000000..312f8cae
--- /dev/null
+++ b/src/hooks/spoofing/write_player_camera_data_node.cpp
@@ -0,0 +1,22 @@
+#include "hooking.hpp"
+#include <datanodes/player/CPlayerGameStateDataNode.hpp>
+#include <datanodes/player/CPlayerCameraDataNode.hpp>
+#include "services/players/player_service.hpp"
+#include "util/globals.hpp"
+
+namespace big
+{
+	bool hooks::write_player_camera_data_node(rage::netObject* player, CPlayerCameraDataNode* node)
+	{
+		auto ret = g_hooking->get_original<hooks::write_player_camera_data_node>()(player, node);
+		
+		if (g.spoofing.spoof_hide_spectate && g.player.spectating)
+		{
+			node->m_free_cam_pos_x += 50.0f;
+			node->m_free_cam_pos_y -= 50.0f;
+			node->m_camera_x -= 50.0f;
+		}
+
+		return ret;
+	}
+}
diff --git a/src/native_hooks/all_scripts.hpp b/src/native_hooks/all_scripts.hpp
index a799e8c4..321f820c 100644
--- a/src/native_hooks/all_scripts.hpp
+++ b/src/native_hooks/all_scripts.hpp
@@ -15,12 +15,12 @@ namespace big
         {
             const auto hash = src->get_arg<rage::joaat_t>(0);
 
-            BOOL return_value = DLC::IS_DLC_PRESENT(hash);
+            bool return_value = DLC::IS_DLC_PRESENT(hash);
 
             if (hash == 0x96F02EE6)
                 return_value = return_value || g.settings.dev_dlc;
 
-            src->set_return_value<BOOL>(return_value);
+            src->set_return_value<BOOL>((BOOL)return_value);
         }
 
         void NETWORK_SET_THIS_SCRIPT_IS_NETWORK_SCRIPT(rage::scrNativeCallContext* src)
@@ -75,7 +75,7 @@ namespace big
                 case ControllerInputs::INPUT_VEH_SELECT_PREV_WEAPON:
                 case ControllerInputs::INPUT_DETONATE:
                 case ControllerInputs::INPUT_PICKUP:
-                case ControllerInputs::INPUT_JUMP:
+                // case ControllerInputs::INPUT_JUMP: TODO: add as separate feature
                 case ControllerInputs::INPUT_TALK:
                 case ControllerInputs::INPUT_AIM:
                 case ControllerInputs::INPUT_MELEE_ATTACK_LIGHT:
@@ -87,11 +87,24 @@ namespace big
                 case ControllerInputs::INPUT_VEH_AIM:
                 case ControllerInputs::INPUT_VEH_PASSENGER_ATTACK:
                 case ControllerInputs::INPUT_VEH_FLY_SELECT_NEXT_WEAPON:
+                case ControllerInputs::INPUT_ATTACK:
+                case ControllerInputs::INPUT_NEXT_WEAPON:
+                case ControllerInputs::INPUT_PREV_WEAPON:
+                case ControllerInputs::INPUT_SELECT_NEXT_WEAPON:
+                case ControllerInputs::INPUT_SELECT_PREV_WEAPON:
                     return;
                 }
             }
 
             PAD::DISABLE_CONTROL_ACTION(src->get_arg<int>(0), (int)action, src->get_arg<int>(2));
         }
+
+        void HUD_FORCE_WEAPON_WHEEL(rage::scrNativeCallContext* src)
+        {
+            if (g.weapons.interior_weapon && src->get_arg<BOOL>(0) == false)
+                return;
+
+            HUD::HUD_FORCE_WEAPON_WHEEL(src->get_arg<BOOL>(0));
+        }
     }
 }
\ No newline at end of file
diff --git a/src/native_hooks/freemode.hpp b/src/native_hooks/freemode.hpp
index 96b4bcfc..1212fa9e 100644
--- a/src/native_hooks/freemode.hpp
+++ b/src/native_hooks/freemode.hpp
@@ -45,28 +45,35 @@ namespace big
 
 		void NETWORK_HAS_RECEIVED_HOST_BROADCAST_DATA(rage::scrNativeCallContext* src)
 		{
-			if (SCRIPT::GET_HASH_OF_THIS_SCRIPT_NAME() == RAGE_JOAAT("freemode") && g.session.force_script_host)
+			if (NETWORK::NETWORK_IS_ACTIVITY_SESSION())
 			{
-				g_fiber_pool->queue_job([]
-				{
-					scripts::force_host(RAGE_JOAAT("freemode"));
-					if (auto script = gta_util::find_script_thread(RAGE_JOAAT("freemode")); script && script->m_net_component)
-						script->m_net_component->block_host_migration(true);
-				});
+				src->set_return_value<BOOL>(NETWORK::NETWORK_HAS_RECEIVED_HOST_BROADCAST_DATA());
 			}
-
-			if (SCRIPT::GET_HASH_OF_THIS_SCRIPT_NAME() == RAGE_JOAAT("fmmc_launcher") && g.session.force_script_host)
+			else
 			{
-				g_fiber_pool->queue_job([]
+				if (SCRIPT::GET_HASH_OF_THIS_SCRIPT_NAME() == RAGE_JOAAT("freemode") && g.session.force_script_host)
 				{
-					scripts::force_host(RAGE_JOAAT("fmmc_launcher"));
-					if (auto script = gta_util::find_script_thread(RAGE_JOAAT("fmmc_launcher")); script && script->m_net_component)
-						script->m_net_component->block_host_migration(true);
-				});
-			}
+					g_fiber_pool->queue_job([]
+					{
+						scripts::force_host(RAGE_JOAAT("freemode"));
+						if (auto script = gta_util::find_script_thread(RAGE_JOAAT("freemode")); script && script->m_net_component)
+							script->m_net_component->block_host_migration(true);
+					});
+				}
 
-			scr_functions::set_freemode_session_active({});
-			src->set_return_value<BOOL>(TRUE);
+				if (SCRIPT::GET_HASH_OF_THIS_SCRIPT_NAME() == RAGE_JOAAT("fmmc_launcher") && g.session.force_script_host)
+				{
+					g_fiber_pool->queue_job([]
+					{
+						scripts::force_host(RAGE_JOAAT("fmmc_launcher"));
+						if (auto script = gta_util::find_script_thread(RAGE_JOAAT("fmmc_launcher")); script && script->m_net_component)
+							script->m_net_component->block_host_migration(true);
+					});
+				}
+
+				scr_functions::set_freemode_session_active({});
+				src->set_return_value<BOOL>(TRUE);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/native_hooks/native_hooks.cpp b/src/native_hooks/native_hooks.cpp
index 3af77006..060a3bf9 100644
--- a/src/native_hooks/native_hooks.cpp
+++ b/src/native_hooks/native_hooks.cpp
@@ -108,6 +108,7 @@ namespace big
 		add_native_detour(0xD1110739EEADB592, all_scripts::NETWORK_TRY_TO_SET_THIS_SCRIPT_IS_NETWORK_SCRIPT);
 		add_native_detour(0xADF692B254977C0C, all_scripts::SET_CURRENT_PED_WEAPON);
 		add_native_detour(0xFE99B66D079CF6BC, all_scripts::DISABLE_CONTROL_ACTION);
+		add_native_detour(0xEB354E5376BC81A7, all_scripts::HUD_FORCE_WEAPON_WHEEL);
 
 		add_native_detour(RAGE_JOAAT("carmod_shop"), 0x06843DA7060A026B, carmod_shop::SET_ENTITY_COORDS);
 		add_native_detour(RAGE_JOAAT("carmod_shop"), 0x8E2530AA8ADA980E, carmod_shop::SET_ENTITY_HEADING);
@@ -142,6 +143,7 @@ namespace big
 		add_native_detour(RAGE_JOAAT("fm_lts_creator"), 0x3D3D8B3BE5A83D35, creator::GET_USED_CREATOR_BUDGET);
 		add_native_detour(RAGE_JOAAT("fm_survival_creator"), 0x3D3D8B3BE5A83D35, creator::GET_USED_CREATOR_BUDGET);
 
+
 		for (auto& entry : *g_pointers->m_script_program_table)
 			if (entry.m_program)
 				hook_program(entry.m_program);
diff --git a/src/native_hooks/network_session_host.hpp b/src/native_hooks/network_session_host.hpp
index f9648910..6fccace6 100644
--- a/src/native_hooks/network_session_host.hpp
+++ b/src/native_hooks/network_session_host.hpp
@@ -11,7 +11,7 @@ namespace big
         {
 			if (g.session.join_queued)
 			{
-				g_pointers->m_join_session_by_info(*g_pointers->m_network, &g.session.info, 1, 1 | 2 | 4, nullptr, 0);
+				g_pointers->m_join_session_by_info(*g_pointers->m_network, &g.session.info, 1, 1 | 2, nullptr, 0);
 				g.session.join_queued = false;
 				src->set_return_value<BOOL>(TRUE);
 			}
diff --git a/src/pointers.cpp b/src/pointers.cpp
index f1fe4cfd..47756860 100644
--- a/src/pointers.cpp
+++ b/src/pointers.cpp
@@ -818,6 +818,12 @@ namespace big
 			m_receive_pickup = ptr.as<PVOID>();
 		});
 
+		// Write Player Camera Data Node
+		main_batch.add("WPCDN", "48 8B C4 48 89 58 20 55 56 57 41 54 41 55 41 56 41 57 48 8D 6C 24 B0 48 81 EC 50 01 00 00 4C", [this](memory::handle ptr)
+		{
+			m_write_player_camera_data_node = ptr.as<PVOID>();
+		});
+
 		auto mem_region = memory::module("GTA5.exe");
 		if (!main_batch.run(mem_region))
 		{
diff --git a/src/pointers.hpp b/src/pointers.hpp
index ba5f9128..fa48db2c 100644
--- a/src/pointers.hpp
+++ b/src/pointers.hpp
@@ -239,6 +239,8 @@ namespace big
 		PVOID m_received_array_update;
 
 		PVOID m_receive_pickup{};
+
+		PVOID m_write_player_camera_data_node{};
 	};
 
 	inline pointers* g_pointers{};
diff --git a/src/services/players/player.hpp b/src/services/players/player.hpp
index 872692a2..6e043ced 100644
--- a/src/services/players/player.hpp
+++ b/src/services/players/player.hpp
@@ -65,7 +65,7 @@ namespace big
 		bool ragdoll_loop = false;
 		bool rotate_cam_loop = false;
 
-		rate_limiter m_host_migration_rate_limit{ 1s, 20 };
+		rate_limiter m_host_migration_rate_limit{ 2s, 15 };
 		rate_limiter m_play_sound_rate_limit{ 1s, 10 };
 		rate_limiter m_invites_rate_limit{ 10s, 2 };
 		int m_num_spawned_permanent_vehicles = 0;
diff --git a/src/services/vehicle/persist_car_service.cpp b/src/services/vehicle/persist_car_service.cpp
index cb8cc70f..aa493099 100644
--- a/src/services/vehicle/persist_car_service.cpp
+++ b/src/services/vehicle/persist_car_service.cpp
@@ -131,7 +131,7 @@ namespace big
 			ENTITY::SET_ENTITY_VISIBLE(vehicle_to_attach, attachment.is_visible, 0);
 			ENTITY::SET_ENTITY_COLLISION(vehicle_to_attach, attachment.has_collision, true);
 			ENTITY::SET_ENTITY_INVINCIBLE(vehicle_to_attach, attachment.is_invincible);
-			VEHICLE::SET_VEHICLE_IS_CONSIDERED_BY_PLAYER(vehicle_to_attach, true);
+			VEHICLE::SET_VEHICLE_IS_CONSIDERED_BY_PLAYER(vehicle_to_attach, false);
 		}
 
 		return vehicle;
diff --git a/src/views/debug/view_debug.cpp b/src/views/debug/view_debug.cpp
index e45237f7..cf667a5b 100644
--- a/src/views/debug/view_debug.cpp
+++ b/src/views/debug/view_debug.cpp
@@ -17,6 +17,7 @@ namespace big
 			locals();
 			script_events();
 			scripts();
+			threads();
 			ImGui::EndTabBar();
 		}
 		ImGui::End();
diff --git a/src/views/debug/view_debug.hpp b/src/views/debug/view_debug.hpp
index 1dd444bf..f6335c24 100644
--- a/src/views/debug/view_debug.hpp
+++ b/src/views/debug/view_debug.hpp
@@ -8,6 +8,7 @@ namespace big::debug
 	extern void misc();
 	extern void script_events();
 	extern void scripts();
+	extern void threads();
 
 	extern void main();
 }
\ No newline at end of file
diff --git a/src/views/debug/view_debug_threads.cpp b/src/views/debug/view_debug_threads.cpp
new file mode 100644
index 00000000..b67690d9
--- /dev/null
+++ b/src/views/debug/view_debug_threads.cpp
@@ -0,0 +1,177 @@
+#include "gui/components/components.hpp"
+#include "natives.hpp"
+#include "util/system.hpp"
+#include "util/misc.hpp"
+#include "view_debug.hpp"
+#include "network/Network.hpp"
+#include "script.hpp"
+#include "gta/joaat.hpp"
+#include "script_global.hpp"
+#include "gta_util.hpp"
+
+#include "core/data/all_script_names.hpp"
+#include "core/data/stack_sizes.hpp"
+
+#include "fiber_pool.hpp"
+
+static rage::scrThread* selected_thread;
+
+static int selected_stack_size = 128;
+static int free_stacks = -1;
+static const char* selected_stack_size_str = "MULTIPLAYER_MISSION";
+static const char* selected_script = "<SELECT>";
+
+static std::chrono::high_resolution_clock::time_point last_stack_update_time{};
+
+namespace
+{
+	static void update_free_stacks_count()
+	{
+		free_stacks = MISC::GET_NUMBER_OF_FREE_STACKS_OF_THIS_SIZE(selected_stack_size);
+	}
+}
+
+namespace big
+{
+
+	void debug::threads()
+	{
+		if (ImGui::BeginTabItem("Threads"))
+		{
+			if (!g_pointers->m_script_threads)
+			{
+				selected_thread = nullptr;
+				ImGui::EndTabItem();
+				return;
+			}
+
+			components::small_text("Threads");
+
+			if (ImGui::BeginCombo("Thread", selected_thread ? selected_thread->m_name : "NONE"))
+			{
+				for (auto script : *g_pointers->m_script_threads)
+				{
+					if (script)
+					{
+						if (script->m_context.m_state != rage::eThreadState::killed && script->m_context.m_stack_size == 0)
+							continue;
+
+						ImGui::PushID(script->m_context.m_thread_id);
+
+						if (script->m_context.m_state == rage::eThreadState::killed)
+							ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 0.1f, 0.1f, 1.f));
+
+						if (ImGui::Selectable(script->m_name, selected_thread == script))
+						{
+							selected_thread = script;
+						}
+
+						if (selected_thread == script)
+							ImGui::SetItemDefaultFocus();
+
+						if (script->m_context.m_state == rage::eThreadState::killed)
+							ImGui::PopStyleColor();
+
+						ImGui::PopID();
+					}
+				}
+				ImGui::EndCombo();
+			}
+
+			if (selected_thread)
+			{
+				ImGui::Combo("State", (int*)&selected_thread->m_context.m_state, "RUNNING\0WAITING\0KILLED\0PAUSED\0STATE_4");
+
+				ImGui::Text("Stack Pointer / Stack Size %d/%d", selected_thread->m_context.m_stack_pointer, selected_thread->m_context.m_stack_size);
+				ImGui::Text("IP: %X", selected_thread->m_context.m_instruction_pointer);
+				if (selected_thread->m_context.m_state == rage::eThreadState::killed)
+					ImGui::Text("Exit Reason: %s", selected_thread->m_exit_message);
+
+				if (ImGui::Button("Kill"))
+				{
+					if (selected_thread->m_context.m_stack_size != 0)
+						selected_thread->kill();
+
+					selected_thread->m_context.m_state = rage::eThreadState::killed;
+				}
+			}
+
+			components::small_text("New");
+
+			if (ImGui::BeginCombo("Script", selected_script))
+			{
+				for (auto script : all_script_names)
+				{
+					if (ImGui::Selectable(script, script == selected_script))
+					{
+						selected_script = script;
+
+					}
+
+					if (script == selected_script)
+						ImGui::SetItemDefaultFocus();
+				}
+				ImGui::EndCombo();
+			}
+
+			if (ImGui::BeginCombo("Stack Size", selected_stack_size_str))
+			{
+				for (auto& p : stack_sizes)
+				{
+					if (ImGui::Selectable(std::format("{} ({})", p.first, p.second).data(), selected_stack_size == p.second))
+					{
+						selected_stack_size_str = p.first;
+						selected_stack_size = p.second;
+
+						g_fiber_pool->queue_job([]
+						{
+							update_free_stacks_count();
+						});
+					}
+
+					if (p.second == selected_stack_size)
+						ImGui::SetItemDefaultFocus();
+				}
+				ImGui::EndCombo();
+			}
+
+			ImGui::Text("Free Stacks: %d", free_stacks);
+
+			components::button("Start", []
+			{
+				auto hash = rage::joaat(selected_script);
+
+				if (!SCRIPT::DOES_SCRIPT_WITH_NAME_HASH_EXIST(hash))
+				{
+					return;
+				}
+
+				if (MISC::GET_NUMBER_OF_FREE_STACKS_OF_THIS_SIZE(selected_stack_size) == 0)
+				{
+					g_notification_service->push_warning("Script Launcher", "No free stacks for this stack size");
+				}
+
+				while (!SCRIPT::HAS_SCRIPT_WITH_NAME_HASH_LOADED(hash))
+				{
+					SCRIPT::REQUEST_SCRIPT_WITH_NAME_HASH(hash);
+					script::get_current()->yield();
+				}
+
+				SYSTEM::START_NEW_SCRIPT_WITH_NAME_HASH(hash, selected_stack_size);
+
+				SCRIPT::SET_SCRIPT_WITH_NAME_HASH_AS_NO_LONGER_NEEDED(hash);
+
+				update_free_stacks_count();
+			});
+
+			if (*g_pointers->m_game_state != eGameState::Invalid && std::chrono::high_resolution_clock::now() - last_stack_update_time > 100ms)
+			{
+				last_stack_update_time = std::chrono::high_resolution_clock::now();
+				g_fiber_pool->queue_job([]
+				{
+					update_free_stacks_count();
+				});
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/views/network/view_spoofing.cpp b/src/views/network/view_spoofing.cpp
index d03625ff..d5173849 100644
--- a/src/views/network/view_spoofing.cpp
+++ b/src/views/network/view_spoofing.cpp
@@ -11,6 +11,8 @@ namespace big
 	{
 		components::small_text("SPOOFING_DESCRIPTION"_T);
 
+		ImGui::Checkbox("Hide From Player List", &g.spoofing.hide_from_player_list);
+
 		components::sub_title("SPOOFING_HIDE_FEATURES"_T);
 		ImGui::Checkbox("SPOOFING_HIDE_GOD_MODE"_T.data(), &g.spoofing.spoof_hide_god);
 		ImGui::Checkbox("SPOOFING_HIDE_SPECTATE"_T.data(), &g.spoofing.spoof_hide_spectate);
diff --git a/src/views/players/player/player_info.cpp b/src/views/players/player/player_info.cpp
index c46aa9a1..324663f8 100644
--- a/src/views/players/player/player_info.cpp
+++ b/src/views/players/player/player_info.cpp
@@ -106,7 +106,7 @@ namespace big
 
 			ImGui::Separator();
 
-			if (auto net_player_data = g_player_service->get_selected()->get_net_data(); net_player_data != nullptr)
+			if (auto net_player_data = g_player_service->get_selected()->get_net_data())
 			{
 				ImGui::Text("PLAYER_INFO_RID"_T.data(), net_player_data->m_gamer_handle.m_rockstar_id);
 
diff --git a/src/views/self/view_self.cpp b/src/views/self/view_self.cpp
index 5b9e9c51..673c95cf 100644
--- a/src/views/self/view_self.cpp
+++ b/src/views/self/view_self.cpp
@@ -26,7 +26,7 @@ namespace big
 
 		ImGui::BeginGroup();
 
-		ImGui::Checkbox("God Mode", &g.self.god_mode);
+		components::command_checkbox<"godmode">();
 		components::command_checkbox<"otr">();
 		components::command_checkbox<"freecam">();
 		components::command_checkbox<"nophone">();
@@ -52,14 +52,13 @@ namespace big
 
 		components::command_checkbox<"invis">();
 		if (g.self.invisibility)
-			components::command_checkbox<"localvis">();
+			components::command_checkbox<"localvis">(); // TODO: does nothing in SP
 		components::command_checkbox<"cleanloop">();
 		components::command_checkbox<"nocollision">();
 		components::command_checkbox<"mobileradio">();
 		components::command_checkbox<"superman">();
 
-		// TODO: fix this, causes a crash
-		// ImGui::Checkbox("DANCE_MODE"_T.data(), &g.self.dance_mode);
+		ImGui::Checkbox("DANCE_MODE"_T.data(), &g.self.dance_mode);
 
 		ImGui::EndGroup();
 
diff --git a/src/views/self/view_weapons.cpp b/src/views/self/view_weapons.cpp
index 919c3ae3..1d922b04 100644
--- a/src/views/self/view_weapons.cpp
+++ b/src/views/self/view_weapons.cpp
@@ -17,7 +17,7 @@ namespace big
 
 		components::command_checkbox<"infammo">();
 		components::command_checkbox<"infclip">();
-		ImGui::Checkbox("Interior Weapon", &g.weapons.interior_weapon);
+		ImGui::Checkbox("Allow Weapons In Interiors", &g.weapons.interior_weapon);
 
 		ImGui::EndGroup();
 		ImGui::SameLine();
diff --git a/src/views/vehicle/view_vehicle.cpp b/src/views/vehicle/view_vehicle.cpp
index 9b1ca320..922d296e 100644
--- a/src/views/vehicle/view_vehicle.cpp
+++ b/src/views/vehicle/view_vehicle.cpp
@@ -75,7 +75,6 @@ namespace big
 			if (g.vehicle.vehinvisibility)
 			{
 				components::command_checkbox<"localinvisveh">();
-				components::command_checkbox<"localinvisped">();
 			}
 
 			ImGui::EndGroup();