diff --git a/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp b/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp
index f000aa5b..94c133dd 100644
--- a/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp
+++ b/SHADE_Engine/src/Math/Transform/SHTransformSystem.cpp
@@ -231,12 +231,12 @@ namespace SHADE
       tf.worldRotation  = tf.localRotation + (parent ? parent->GetLocalRotation() : SHVec3::Zero);
 
       // Set the orientation
-      // Wrap rotations between -360 and 360 and convert to radians
+      // Wrap rotations between -720 and 720 and convert to radians
       SHVec3 worldRotRad, localRotRad;
       for (size_t i = 0; i < SHVec3::SIZE; ++i)
       {
-        worldRotRad[i] = SHMath::Wrap(tf.worldRotation[i], -SHMath::TWO_PI, SHMath::TWO_PI);
-        localRotRad[i] = SHMath::Wrap(tf.localRotation[i], -SHMath::TWO_PI, SHMath::TWO_PI);
+        worldRotRad[i] = SHMath::Wrap(tf.worldRotation[i], -2.0f * SHMath::TWO_PI, 2.0f * SHMath::TWO_PI);
+        localRotRad[i] = SHMath::Wrap(tf.localRotation[i], -2.0f * SHMath::TWO_PI, 2.0f * SHMath::TWO_PI);
       }
 
       tf.world.orientation = SHQuaternion::FromEuler(worldRotRad);
diff --git a/SHADE_Engine/src/Physics/SHPhysicsSystem.cpp b/SHADE_Engine/src/Physics/SHPhysicsSystem.cpp
index bdee8ba1..66c28958 100644
--- a/SHADE_Engine/src/Physics/SHPhysicsSystem.cpp
+++ b/SHADE_Engine/src/Physics/SHPhysicsSystem.cpp
@@ -605,7 +605,6 @@ namespace SHADE
       
       if (rigidBodyComponent != nullptr)
       {
-        
         if (rigidBodyComponent->GetType() == SHRigidBodyComponent::Type::STATIC)
           continue;
 
@@ -658,8 +657,10 @@ namespace SHADE
   {
     const auto IT = std::ranges::find_if(container.begin(), container.end(), [&](const SHCollisionEvent& e)
     {
-      const bool ENTITY_MATCH     = e.value[0] == collisionEvent.value[0];
-      const bool COLLIDERS_MATCH  = e.value[1] == collisionEvent.value[1];
+      const bool ENTITY_MATCH     =   (e.ids[0] == collisionEvent.ids[0] && e.ids[1] == collisionEvent.ids[1])
+                                  ||  (e.ids[0] == collisionEvent.ids[1] && e.ids[1] == collisionEvent.ids[0]);
+      const bool COLLIDERS_MATCH  =   (e.ids[2] == collisionEvent.ids[2] && e.ids[3] == collisionEvent.ids[3])
+                                  ||  (e.ids[2] == collisionEvent.ids[3] && e.ids[3] == collisionEvent.ids[2]);
       return ENTITY_MATCH && COLLIDERS_MATCH;
     });
 
diff --git a/SHADE_Engine/src/Physics/SHPhysicsSystem.h b/SHADE_Engine/src/Physics/SHPhysicsSystem.h
index 05e6e57e..0dd2754e 100644
--- a/SHADE_Engine/src/Physics/SHPhysicsSystem.h
+++ b/SHADE_Engine/src/Physics/SHPhysicsSystem.h
@@ -183,24 +183,24 @@ namespace SHADE
     /* Function Members                                                                */
     /*---------------------------------------------------------------------------------*/
 
-    SHPhysicsObject*  EnsurePhysicsObject       (EntityID entityID) noexcept;
-    SHPhysicsObject*  GetPhysicsObject          (EntityID entityID) noexcept;
-    void              DestroyPhysicsObject      (EntityID entityID) noexcept;
+    SHPhysicsObject*  EnsurePhysicsObject     (EntityID entityID) noexcept;
+    SHPhysicsObject*  GetPhysicsObject        (EntityID entityID) noexcept;
+    void              DestroyPhysicsObject    (EntityID entityID) noexcept;
 
-    static void       SyncActiveStates          (SHPhysicsObject& physicsObject, bool componentActive)  noexcept;
-    void              SyncTransforms            ()                                                      noexcept;
+    static void       SyncActiveStates        (SHPhysicsObject& physicsObject, bool componentActive)  noexcept;
+    void              SyncTransforms          ()                                                      noexcept;
 
-    static void       UpdateEventContainers     (const SHCollisionEvent& collisionEvent, CollisionEvents& container)  noexcept;
-    void              ClearInvalidCollisions    ()                                                              noexcept;
+    static void       UpdateEventContainers   (const SHCollisionEvent& collisionEvent, CollisionEvents& container)  noexcept;
+    void              ClearInvalidCollisions  () noexcept;
 
-    SHEventHandle     AddPhysicsComponent       (SHEventPtr addComponentEvent);
-    SHEventHandle     RemovePhysicsComponent    (SHEventPtr removeComponentEvent);
-    SHEventHandle     ResetWorld                (SHEventPtr editorStopEvent);
+    SHEventHandle     AddPhysicsComponent     (SHEventPtr addComponentEvent);
+    SHEventHandle     RemovePhysicsComponent  (SHEventPtr removeComponentEvent);
+    SHEventHandle     ResetWorld              (SHEventPtr editorStopEvent);
 
     template <typename RP3DCollisionPair, typename = std::enable_if_t
                                                     <std::is_same_v<RP3DCollisionPair, rp3d::CollisionCallback::ContactPair>
                                                   || std::is_same_v<RP3DCollisionPair, rp3d::OverlapCallback::OverlapPair>>>
-    SHCollisionEvent GenerateCollisionEvent     (const RP3DCollisionPair& cp)           noexcept;
+    SHCollisionEvent GenerateCollisionEvent   (const RP3DCollisionPair& cp) noexcept;
   };
 } // namespace SHADE