diff --git a/QSB/Animation/AnimationSync.cs b/QSB/Animation/AnimationSync.cs
index 8dc98673..5d120504 100644
--- a/QSB/Animation/AnimationSync.cs
+++ b/QSB/Animation/AnimationSync.cs
@@ -145,19 +145,19 @@ namespace QSB.Animation
 
 		private void OnBecomeUngrounded() => _netAnim.SetTrigger("Ungrounded");
 
-		public void SendCrouch(float value = 0) => QSBEventManager.FireEvent(EventNames.QSBCrouch, value);
+		public void SendCrouch(float value = 0) => QSBEventManager.FireEvent<float>(EventNames.QSBCrouch, value);
 
 		public void HandleCrouch(float value) => _crouchSync.CrouchParam.Target = value;
 
 		private void SuitUp()
 		{
-			QSBEventManager.FireEvent(EventNames.QSBChangeAnimType, PlayerId, AnimationType.PlayerSuited);
+			QSBEventManager.FireEvent<uint, AnimationType>(EventNames.QSBChangeAnimType, PlayerId, AnimationType.PlayerSuited);
 			SetAnimationType(AnimationType.PlayerSuited);
 		}
 
 		private void SuitDown()
 		{
-			QSBEventManager.FireEvent(EventNames.QSBChangeAnimType, PlayerId, AnimationType.PlayerUnsuited);
+			QSBEventManager.FireEvent<uint, AnimationType>(EventNames.QSBChangeAnimType, PlayerId, AnimationType.PlayerUnsuited);
 			SetAnimationType(AnimationType.PlayerUnsuited);
 		}
 
diff --git a/QSB/ConversationSync/ConversationManager.cs b/QSB/ConversationSync/ConversationManager.cs
index 01af07ce..4a0a52b5 100644
--- a/QSB/ConversationSync/ConversationManager.cs
+++ b/QSB/ConversationSync/ConversationManager.cs
@@ -42,7 +42,7 @@ namespace QSB.ConversationSync
 		}
 
 		public void SendPlayerOption(string text) =>
-			QSBEventManager.FireEvent(EventNames.QSBConversation, QSBPlayerManager.LocalPlayerId, text, ConversationType.Player);
+			QSBEventManager.FireEvent<uint, string, ConversationType>(EventNames.QSBConversation, QSBPlayerManager.LocalPlayerId, text, ConversationType.Player);
 
 		public void SendCharacterDialogue(int id, string text)
 		{
@@ -51,14 +51,14 @@ namespace QSB.ConversationSync
 				DebugLog.ToConsole("Warning - Tried to send conv. event with char id -1.", MessageType.Warning);
 				return;
 			}
-			QSBEventManager.FireEvent(EventNames.QSBConversation, (uint)id, text, ConversationType.Character);
+			QSBEventManager.FireEvent<uint, string, ConversationType>(EventNames.QSBConversation, (uint)id, text, ConversationType.Character);
 		}
 
 		public void CloseBoxPlayer() =>
-			QSBEventManager.FireEvent(EventNames.QSBConversation, QSBPlayerManager.LocalPlayerId, "", ConversationType.ClosePlayer);
+			QSBEventManager.FireEvent<uint, string, ConversationType>(EventNames.QSBConversation, QSBPlayerManager.LocalPlayerId, "", ConversationType.ClosePlayer);
 
 		public void CloseBoxCharacter(int id) =>
-			QSBEventManager.FireEvent(EventNames.QSBConversation, (uint)id, "", ConversationType.CloseCharacter);
+			QSBEventManager.FireEvent<uint, string, ConversationType>(EventNames.QSBConversation, (uint)id, "", ConversationType.CloseCharacter);
 
 		public void SendConvState(int charId, bool state)
 		{
@@ -67,7 +67,7 @@ namespace QSB.ConversationSync
 				DebugLog.ToConsole("Warning - Tried to send conv. start/end event with char id -1.", MessageType.Warning);
 				return;
 			}
-			QSBEventManager.FireEvent(EventNames.QSBConversationStartEnd, charId, QSBPlayerManager.LocalPlayerId, state);
+			QSBEventManager.FireEvent<int, uint, bool>(EventNames.QSBConversationStartEnd, charId, QSBPlayerManager.LocalPlayerId, state);
 		}
 
 		public void DisplayPlayerConversationBox(uint playerId, string text)
diff --git a/QSB/DeathSync/Patches/DeathPatches.cs b/QSB/DeathSync/Patches/DeathPatches.cs
index d839e680..fb8c61b9 100644
--- a/QSB/DeathSync/Patches/DeathPatches.cs
+++ b/QSB/DeathSync/Patches/DeathPatches.cs
@@ -50,7 +50,7 @@ namespace QSB.DeathSync.Patches
 		}
 
 		public static void BroadcastDeath(DeathType deathType)
-			=> QSBEventManager.FireEvent(EventNames.QSBPlayerDeath, deathType);
+			=> QSBEventManager.FireEvent<DeathType>(EventNames.QSBPlayerDeath, deathType);
 
 		public static void DamageController_Exploded(ref bool ____exploded)
 			=> ____exploded = true;
diff --git a/QSB/ElevatorSync/Patches/ElevatorPatches.cs b/QSB/ElevatorSync/Patches/ElevatorPatches.cs
index 77de5de9..6153242b 100644
--- a/QSB/ElevatorSync/Patches/ElevatorPatches.cs
+++ b/QSB/ElevatorSync/Patches/ElevatorPatches.cs
@@ -12,7 +12,7 @@ namespace QSB.ElevatorSync.Patches
 		{
 			var isGoingUp = __instance.GetValue<bool>("_goingToTheEnd");
 			var id = ElevatorManager.Instance.GetId(__instance);
-			QSBEventManager.FireEvent(EventNames.QSBStartLift, id, isGoingUp);
+			QSBEventManager.FireEvent<int, bool>(EventNames.QSBStartLift, id, isGoingUp);
 		}
 
 		public override void DoPatches() => QSBCore.Helper.HarmonyHelper.AddPostfix<Elevator>("StartLift", typeof(ElevatorPatches), nameof(StartLift));
diff --git a/QSB/Events/QSBEventManager.cs b/QSB/Events/QSBEventManager.cs
index be487eee..09038433 100644
--- a/QSB/Events/QSBEventManager.cs
+++ b/QSB/Events/QSBEventManager.cs
@@ -92,34 +92,34 @@ namespace QSB.Events
 			GlobalMessenger.FireEvent(eventName);
 		}
 
-		public static void FireEvent<T>(string eventName, T arg)
+		public static void FireEvent<T>(string eventName, object arg)
 		{
 			if (!QSBCore.IsInMultiplayer)
 			{
 				DebugLog.ToConsole($"Warning - Tried to send event {eventName} while not connected to/hosting server.", MessageType.Warning);
 				return;
 			}
-			GlobalMessenger<T>.FireEvent(eventName, arg);
+			GlobalMessenger<T>.FireEvent(eventName, (T)arg);
 		}
 
-		public static void FireEvent<T, U>(string eventName, T arg1, U arg2)
+		public static void FireEvent<T, U>(string eventName, object arg1, object arg2)
 		{
 			if (!QSBCore.IsInMultiplayer)
 			{
 				DebugLog.ToConsole($"Warning - Tried to send event {eventName} while not connected to/hosting server.", MessageType.Warning);
 				return;
 			}
-			GlobalMessenger<T, U>.FireEvent(eventName, arg1, arg2);
+			GlobalMessenger<T, U>.FireEvent(eventName, (T)arg1, (U)arg2);
 		}
 
-		public static void FireEvent<T, U, V>(string eventName, T arg1, U arg2, V arg3)
+		public static void FireEvent<T, U, V>(string eventName, object arg1, object arg2, object arg3)
 		{
 			if (!QSBCore.IsInMultiplayer)
 			{
 				DebugLog.ToConsole($"Warning - Tried to send event {eventName} while not connected to/hosting server.", MessageType.Warning);
 				return;
 			}
-			GlobalMessenger<T, U, V>.FireEvent(eventName, arg1, arg2, arg3);
+			GlobalMessenger<T, U, V>.FireEvent(eventName, (T)arg1, (U)arg2, (V)arg3);
 		}
 	}
 }
\ No newline at end of file
diff --git a/QSB/FrequencySync/Patches/FrequencyPatches.cs b/QSB/FrequencySync/Patches/FrequencyPatches.cs
index e213544e..f0586027 100644
--- a/QSB/FrequencySync/Patches/FrequencyPatches.cs
+++ b/QSB/FrequencySync/Patches/FrequencyPatches.cs
@@ -20,9 +20,9 @@ namespace QSB.FrequencySync.Patches
 		}
 
 		public static void IdentifyFrequency(SignalFrequency ____frequency)
-			=> QSBEventManager.FireEvent(EventNames.QSBIdentifyFrequency, ____frequency);
+			=> QSBEventManager.FireEvent<SignalFrequency>(EventNames.QSBIdentifyFrequency, ____frequency);
 
 		public static void IdentifySignal(SignalName ____name)
-			=> QSBEventManager.FireEvent(EventNames.QSBIdentifySignal, ____name);
+			=> QSBEventManager.FireEvent<SignalName>(EventNames.QSBIdentifySignal, ____name);
 	}
 }
diff --git a/QSB/GeyserSync/WorldObjects/QSBGeyser.cs b/QSB/GeyserSync/WorldObjects/QSBGeyser.cs
index b4044768..907dea83 100644
--- a/QSB/GeyserSync/WorldObjects/QSBGeyser.cs
+++ b/QSB/GeyserSync/WorldObjects/QSBGeyser.cs
@@ -18,7 +18,7 @@ namespace QSB.GeyserSync.WorldObjects
 		{
 			if (QNetworkServer.active)
 			{
-				QSBEventManager.FireEvent(EventNames.QSBGeyserState, ObjectId, state);
+				QSBEventManager.FireEvent<int, bool>(EventNames.QSBGeyserState, ObjectId, state);
 			}
 		}
 
diff --git a/QSB/Instruments/InstrumentsManager.cs b/QSB/Instruments/InstrumentsManager.cs
index 0d8a2dd4..f1d474c3 100644
--- a/QSB/Instruments/InstrumentsManager.cs
+++ b/QSB/Instruments/InstrumentsManager.cs
@@ -115,7 +115,7 @@ namespace QSB.Instruments
 
 		public void SwitchToType(AnimationType type)
 		{
-			QSBEventManager.FireEvent(EventNames.QSBChangeAnimType, QSBPlayerManager.LocalPlayerId, type);
+			QSBEventManager.FireEvent<uint, AnimationType>(EventNames.QSBChangeAnimType, QSBPlayerManager.LocalPlayerId, type);
 			QSBPlayerManager.LocalPlayer.AnimationSync.SetAnimationType(type);
 			CheckInstrumentProps(type);
 		}
diff --git a/QSB/Instruments/QSBCamera/CameraManager.cs b/QSB/Instruments/QSBCamera/CameraManager.cs
index 7d1dd60c..8ecd3692 100644
--- a/QSB/Instruments/QSBCamera/CameraManager.cs
+++ b/QSB/Instruments/QSBCamera/CameraManager.cs
@@ -82,7 +82,7 @@ namespace QSB.Instruments.QSBCamera
 				return;
 			}
 			OWInput.ChangeInputMode(InputMode.None);
-			QSBEventManager.FireEvent("SwitchActiveCamera", _owCamera);
+			QSBEventManager.FireEvent<OWCamera>("SwitchActiveCamera", _owCamera);
 			Locator.GetPlayerCamera().mainCamera.enabled = false;
 			if (_cameraObj.GetComponent<PostProcessingBehaviour>() == null)
 			{
@@ -108,7 +108,7 @@ namespace QSB.Instruments.QSBCamera
 				return;
 			}
 			OWInput.ChangeInputMode(InputMode.Character);
-			QSBEventManager.FireEvent("SwitchActiveCamera", Locator.GetPlayerCamera());
+			QSBEventManager.FireEvent<OWCamera>("SwitchActiveCamera", Locator.GetPlayerCamera());
 			Locator.GetActiveCamera().mainCamera.enabled = true;
 			_camera.enabled = false;
 			Mode = CameraMode.FirstPerson;
diff --git a/QSB/LogSync/Patches/LogPatches.cs b/QSB/LogSync/Patches/LogPatches.cs
index f2afaf06..9591e08b 100644
--- a/QSB/LogSync/Patches/LogPatches.cs
+++ b/QSB/LogSync/Patches/LogPatches.cs
@@ -13,7 +13,7 @@ namespace QSB.LogSync.Patches
 			{
 				return;
 			}
-			QSBEventManager.FireEvent(EventNames.QSBRevealFact, id, saveGame, showNotification);
+			QSBEventManager.FireEvent<string, bool, bool>(EventNames.QSBRevealFact, id, saveGame, showNotification);
 		}
 
 		public override void DoPatches() => QSBCore.Helper.HarmonyHelper.AddPostfix<ShipLogManager>("RevealFact", typeof(LogPatches), nameof(RevealFact));
diff --git a/QSB/OrbSync/Patches/OrbPatches.cs b/QSB/OrbSync/Patches/OrbPatches.cs
index fd05df38..007b3152 100644
--- a/QSB/OrbSync/Patches/OrbPatches.cs
+++ b/QSB/OrbSync/Patches/OrbPatches.cs
@@ -13,7 +13,7 @@ namespace QSB.OrbSync.Patches
 		{
 			if (__result)
 			{
-				QSBEventManager.FireEvent(EventNames.QSBOrbUser, QSBWorldSync.OldOrbList.FindIndex(x => x == __instance));
+				QSBEventManager.FireEvent<int>(EventNames.QSBOrbUser, QSBWorldSync.OldOrbList.FindIndex(x => x == __instance));
 			}
 		}
 
diff --git a/QSB/OrbSync/WorldObjects/QSBOrbSlot.cs b/QSB/OrbSync/WorldObjects/QSBOrbSlot.cs
index 483c19c3..15288561 100644
--- a/QSB/OrbSync/WorldObjects/QSBOrbSlot.cs
+++ b/QSB/OrbSync/WorldObjects/QSBOrbSlot.cs
@@ -33,7 +33,7 @@ namespace QSB.OrbSync.WorldObjects
 			{
 				return;
 			}
-			QSBEventManager.FireEvent(EventNames.QSBOrbSlot, ObjectId, orbId, state);
+			QSBEventManager.FireEvent<int, int, bool>(EventNames.QSBOrbSlot, ObjectId, orbId, state);
 			if (QSBCore.DebugMode)
 			{
 				_debugBoxText.text = state.ToString();
diff --git a/QSB/Player/Events/PlayerReadyEvent.cs b/QSB/Player/Events/PlayerReadyEvent.cs
index fe335616..e9dc19e5 100644
--- a/QSB/Player/Events/PlayerReadyEvent.cs
+++ b/QSB/Player/Events/PlayerReadyEvent.cs
@@ -1,6 +1,7 @@
 using OWML.Common;
 using QSB.Events;
 using QSB.Messaging;
+using QSB.SectorSync.WorldObjects;
 using QSB.Utility;
 using System.Linq;
 
@@ -53,7 +54,7 @@ namespace QSB.Player.Events
 			foreach (var item in QSBPlayerManager.GetSyncObjects<TransformSync.TransformSync>()
 				.Where(x => x != null && x.IsReady && x.ReferenceSector != null && x.PlayerId == LocalPlayerId))
 			{
-				QSBEventManager.FireEvent(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector);
+				QSBEventManager.FireEvent<uint, QSBSector>(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector);
 			}
 		}
 	}
diff --git a/QSB/Player/Events/PlayerStatesRequestEvent.cs b/QSB/Player/Events/PlayerStatesRequestEvent.cs
index 78e8cb01..65577d74 100644
--- a/QSB/Player/Events/PlayerStatesRequestEvent.cs
+++ b/QSB/Player/Events/PlayerStatesRequestEvent.cs
@@ -2,6 +2,7 @@
 using QSB.Events;
 using QSB.Messaging;
 using QSB.QuantumSync;
+using QSB.SectorSync.WorldObjects;
 using QSB.TranslationSync;
 using QSB.TranslationSync.WorldObjects;
 using QSB.Utility;
@@ -32,7 +33,7 @@ namespace QSB.Player.Events
 			foreach (var item in QSBPlayerManager.GetSyncObjects<TransformSync.TransformSync>()
 				.Where(x => x != null && x.IsReady && x.ReferenceSector != null))
 			{
-				QSBEventManager.FireEvent(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector);
+				QSBEventManager.FireEvent<uint, QSBSector>(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector);
 			}
 
 			if (!server)
@@ -44,19 +45,19 @@ namespace QSB.Player.Events
 
 			foreach (var condition in QSBWorldSync.DialogueConditions)
 			{
-				QSBEventManager.FireEvent(EventNames.DialogueCondition, condition.Key, condition.Value);
+				QSBEventManager.FireEvent<string, bool>(EventNames.DialogueCondition, condition.Key, condition.Value);
 			}
 
 			foreach (var fact in QSBWorldSync.ShipLogFacts)
 			{
-				QSBEventManager.FireEvent(EventNames.QSBRevealFact, fact.Id, fact.SaveGame, false);
+				QSBEventManager.FireEvent<string, bool, bool>(EventNames.QSBRevealFact, fact.Id, fact.SaveGame, false);
 			}
 
 			foreach (var wallText in QSBWorldSync.GetWorldObjects<QSBWallText>().Where(x => x.AttachedObject.GetValue<bool>("_initialized") && x.AttachedObject.GetNumTextBlocks() > 0))
 			{
 				foreach (var id in wallText.GetTranslatedIds())
 				{
-					QSBEventManager.FireEvent(EventNames.QSBTextTranslated, NomaiTextType.WallText, wallText.ObjectId, id);
+					QSBEventManager.FireEvent<NomaiTextType, int, int>(EventNames.QSBTextTranslated, NomaiTextType.WallText, wallText.ObjectId, id);
 				}
 			}
 
@@ -64,7 +65,7 @@ namespace QSB.Player.Events
 			{
 				foreach (var id in computer.GetTranslatedIds())
 				{
-					QSBEventManager.FireEvent(EventNames.QSBTextTranslated, NomaiTextType.Computer, computer.ObjectId, id);
+					QSBEventManager.FireEvent<NomaiTextType, int, int>(EventNames.QSBTextTranslated, NomaiTextType.Computer, computer.ObjectId, id);
 				}
 			}
 
@@ -72,14 +73,14 @@ namespace QSB.Player.Events
 			{
 				foreach (var id in vesselComputer.GetTranslatedIds())
 				{
-					QSBEventManager.FireEvent(EventNames.QSBTextTranslated, NomaiTextType.VesselComputer, vesselComputer.ObjectId, id);
+					QSBEventManager.FireEvent<NomaiTextType, int, int>(EventNames.QSBTextTranslated, NomaiTextType.VesselComputer, vesselComputer.ObjectId, id);
 				}
 			}
 
 			var list = QSBWorldSync.GetWorldObjects<IQSBQuantumObject>().ToList();
 			for (var i = 0; i < list.Count; i++)
 			{
-				QSBEventManager.FireEvent(EventNames.QSBQuantumAuthority, i, list[i].ControllingPlayer);
+				QSBEventManager.FireEvent<int, uint>(EventNames.QSBQuantumAuthority, i, list[i].ControllingPlayer);
 			}
 		}
 	}
diff --git a/QSB/QSBNetworkManager.cs b/QSB/QSBNetworkManager.cs
index b7c3a0b5..5d09ab12 100644
--- a/QSB/QSBNetworkManager.cs
+++ b/QSB/QSBNetworkManager.cs
@@ -188,7 +188,7 @@ namespace QSB
 			IsReady = true;
 
 			QSBCore.Helper.Events.Unity.RunWhen(() => QSBEventManager.Ready && PlayerTransformSync.LocalInstance != null,
-				() => QSBEventManager.FireEvent(EventNames.QSBPlayerJoin, _lobby.PlayerName));
+				() => QSBEventManager.FireEvent<string>(EventNames.QSBPlayerJoin, _lobby.PlayerName));
 
 			if (!QSBCore.IsServer)
 			{
diff --git a/QSB/QuantumSync/Events/QuantumAuthorityEvent.cs b/QSB/QuantumSync/Events/QuantumAuthorityEvent.cs
index dc125602..5c0b54d9 100644
--- a/QSB/QuantumSync/Events/QuantumAuthorityEvent.cs
+++ b/QSB/QuantumSync/Events/QuantumAuthorityEvent.cs
@@ -50,6 +50,7 @@ namespace QSB.QuantumSync.Events
 			var objects = QSBWorldSync.GetWorldObjects<IQSBQuantumObject>();
 			var obj = objects.ToList()[message.ObjectId];
 			obj.ControllingPlayer = message.AuthorityOwner;
+			DebugLog.DebugWrite($"LOCAL {(obj as IWorldObject).Name} to owner {message.AuthorityOwner}");
 		}
 
 		public override void OnReceiveRemote(bool server, QuantumAuthorityMessage message)
@@ -61,10 +62,11 @@ namespace QSB.QuantumSync.Events
 				DebugLog.ToConsole($"Warning - object {(obj as IWorldObject).Name} already has owner {obj.ControllingPlayer}, but trying to be replaced by {message.AuthorityOwner}!", MessageType.Warning);
 			}
 			obj.ControllingPlayer = message.AuthorityOwner;
+			DebugLog.DebugWrite($"{(obj as IWorldObject).Name} to owner {message.AuthorityOwner}");
 			if (obj.ControllingPlayer == 0 && obj.IsEnabled)
 			{
 				// object has no owner, but is still active for this player. request ownership
-				QSBEventManager.FireEvent(EventNames.QSBQuantumAuthority, message.ObjectId, QSBPlayerManager.LocalPlayerId);
+				QSBEventManager.FireEvent<int, uint>(EventNames.QSBQuantumAuthority, message.ObjectId, QSBPlayerManager.LocalPlayerId);
 			}
 		}
 	}
diff --git a/QSB/QuantumSync/Patches/QuantumPatches.cs b/QSB/QuantumSync/Patches/QuantumPatches.cs
index 4c486f64..c9f9db59 100644
--- a/QSB/QuantumSync/Patches/QuantumPatches.cs
+++ b/QSB/QuantumSync/Patches/QuantumPatches.cs
@@ -62,7 +62,7 @@ namespace QSB.QuantumSync.Patches
 			var objId = QuantumManager.Instance.GetId(__instance);
 			var socketId = QuantumManager.Instance.GetId(socket);
 			//DebugLog.DebugWrite($"{__instance.name} to socket {socketId}");
-			QSBEventManager.FireEvent(
+			QSBEventManager.FireEvent<int, int, Quaternion>(
 					EventNames.QSBSocketStateChange,
 					objId,
 					socketId,
@@ -95,7 +95,7 @@ namespace QSB.QuantumSync.Patches
 				____shuffledObjects[j].localPosition = ____localPositions[____indexList[j]];
 			}
 			//DebugLog.DebugWrite($"{__instance.name} shuffled.");
-			QSBEventManager.FireEvent(
+			QSBEventManager.FireEvent<int, int[]>(
 					EventNames.QSBQuantumShuffle,
 					QuantumManager.Instance.GetId(__instance),
 					____indexList.ToArray());
@@ -124,7 +124,7 @@ namespace QSB.QuantumSync.Patches
 				return;
 			}
 			//DebugLog.DebugWrite($"{owner.AttachedObject.name} to quantum state {Array.IndexOf(owner.QuantumStates, __instance)}");
-			QSBEventManager.FireEvent(
+			QSBEventManager.FireEvent<int, int>(
 					EventNames.QSBMultiStateChange,
 					QuantumManager.Instance.GetId(owner.AttachedObject),
 					Array.IndexOf(owner.QuantumStates, __instance));
diff --git a/QSB/QuantumSync/Patches/ServerQuantumPatches.cs b/QSB/QuantumSync/Patches/ServerQuantumPatches.cs
index ae6b5b46..57d8629a 100644
--- a/QSB/QuantumSync/Patches/ServerQuantumPatches.cs
+++ b/QSB/QuantumSync/Patches/ServerQuantumPatches.cs
@@ -130,7 +130,7 @@ namespace QSB.QuantumSync.Patches
 						{
 							____stateSkipCounts[k] = (k != ____stateIndex) ? (____stateSkipCounts[k] + 1) : 0;
 						}
-						QSBEventManager.FireEvent(EventNames.QSBMoonStateChange, stateIndex, onUnitSphere, orbitAngle);
+						QSBEventManager.FireEvent<int, Vector3, int>(EventNames.QSBMoonStateChange, stateIndex, onUnitSphere, orbitAngle);
 						break;
 					}
 					____visibilityTracker.transform.localPosition = Vector3.zero;
@@ -157,7 +157,7 @@ namespace QSB.QuantumSync.Patches
 				{
 					____deactivateAtEye[l].SetActive(____stateIndex != 5);
 				}
-				QSBEventManager.FireEvent("QuantumMoonChangeState", ____moonBody);
+				QSBEventManager.FireEvent<OWRigidbody>("QuantumMoonChangeState", ____moonBody);
 				__result = true;
 				return false;
 			}
diff --git a/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs b/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs
index fe65e3bc..3e7ffb4e 100644
--- a/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs
+++ b/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs
@@ -33,6 +33,7 @@ namespace QSB.QuantumSync.WorldObjects
 
 		private void OnEnable()
 		{
+			DebugLog.DebugWrite($"OnEnable of {AttachedObject.name}, ControllingPlayer:{ControllingPlayer}");
 			IsEnabled = true;
 			if (ControllingPlayer != 0)
 			{
@@ -41,11 +42,12 @@ namespace QSB.QuantumSync.WorldObjects
 			}
 			var id = QSBWorldSync.GetWorldObjects<IQSBQuantumObject>().ToList().IndexOf(this);
 			// no one is controlling this object right now, request authority
-			QSBEventManager.FireEvent(EventNames.QSBQuantumAuthority, id, QSBPlayerManager.LocalPlayerId);
+			QSBEventManager.FireEvent<int, uint>(EventNames.QSBQuantumAuthority, id, QSBPlayerManager.LocalPlayerId);
 		}
 
 		private void OnDisable()
 		{
+			DebugLog.DebugWrite($"OnDisable of {AttachedObject.name}, ControllingPlayer:{ControllingPlayer}");
 			IsEnabled = false;
 			if (ControllingPlayer != QSBPlayerManager.LocalPlayerId)
 			{
@@ -54,7 +56,7 @@ namespace QSB.QuantumSync.WorldObjects
 			}
 			var id = QSBWorldSync.GetWorldObjects<IQSBQuantumObject>().ToList().IndexOf(this);
 			// send event to other players that we're releasing authority
-			QSBEventManager.FireEvent(EventNames.QSBQuantumAuthority, id, 0);
+			QSBEventManager.FireEvent<int, uint>(EventNames.QSBQuantumAuthority, id, 0);
 		}
 	}
 }
diff --git a/QSB/SectorSync/SectorSync.cs b/QSB/SectorSync/SectorSync.cs
index ec9d3d3c..1d8fd940 100644
--- a/QSB/SectorSync/SectorSync.cs
+++ b/QSB/SectorSync/SectorSync.cs
@@ -44,6 +44,6 @@ namespace QSB.SectorSync
 		}
 
 		private void SendSector(uint id, QSBSector sector) =>
-			QSBEventManager.FireEvent(EventNames.QSBSectorChange, id, sector);
+			QSBEventManager.FireEvent<uint, QSBSector>(EventNames.QSBSectorChange, id, sector);
 	}
 }
\ No newline at end of file
diff --git a/QSB/TimeSync/WakeUpSync.cs b/QSB/TimeSync/WakeUpSync.cs
index 57b52d20..756cb3c7 100644
--- a/QSB/TimeSync/WakeUpSync.cs
+++ b/QSB/TimeSync/WakeUpSync.cs
@@ -95,7 +95,7 @@ namespace QSB.TimeSync
 			}
 		}
 
-		private void SendServerTime() => QSBEventManager.FireEvent(EventNames.QSBServerTime, Time.timeSinceLevelLoad, _localLoopCount);
+		private void SendServerTime() => QSBEventManager.FireEvent<float, int>(EventNames.QSBServerTime, Time.timeSinceLevelLoad, _localLoopCount);
 
 		public void OnClientReceiveMessage(ServerTimeMessage message)
 		{
diff --git a/QSB/TransformSync/PlayerCameraSync.cs b/QSB/TransformSync/PlayerCameraSync.cs
index f060ab92..c29f9903 100644
--- a/QSB/TransformSync/PlayerCameraSync.cs
+++ b/QSB/TransformSync/PlayerCameraSync.cs
@@ -16,7 +16,7 @@ namespace QSB.TransformSync
 			Player.CameraBody = body.gameObject;
 
 			Player.IsReady = true;
-			QSBEventManager.FireEvent(EventNames.QSBPlayerReady, true);
+			QSBEventManager.FireEvent<bool>(EventNames.QSBPlayerReady, true);
 			DebugLog.DebugWrite("PlayerCameraSync init done - Request state!");
 			QSBEventManager.FireEvent(EventNames.QSBPlayerStatesRequest);
 
diff --git a/QSB/TranslationSync/Patches/SpiralPatches.cs b/QSB/TranslationSync/Patches/SpiralPatches.cs
index c1ba5a6b..c755cc5f 100644
--- a/QSB/TranslationSync/Patches/SpiralPatches.cs
+++ b/QSB/TranslationSync/Patches/SpiralPatches.cs
@@ -27,7 +27,7 @@ namespace QSB.TranslationSync.Patches
 			{
 				return true;
 			}
-			QSBEventManager.FireEvent(
+			QSBEventManager.FireEvent<NomaiTextType, int, int>(
 					EventNames.QSBTextTranslated,
 					NomaiTextType.WallText,
 					SpiralManager.Instance.GetId(__instance),
@@ -41,7 +41,7 @@ namespace QSB.TranslationSync.Patches
 			{
 				return true;
 			}
-			QSBEventManager.FireEvent(
+			QSBEventManager.FireEvent<NomaiTextType, int, int>(
 					EventNames.QSBTextTranslated,
 					NomaiTextType.Computer,
 					SpiralManager.Instance.GetId(__instance),
@@ -55,7 +55,7 @@ namespace QSB.TranslationSync.Patches
 			{
 				return true;
 			}
-			QSBEventManager.FireEvent(
+			QSBEventManager.FireEvent<NomaiTextType, int, int>(
 					EventNames.QSBTextTranslated,
 					NomaiTextType.VesselComputer,
 					SpiralManager.Instance.GetId(__instance),