diff --git a/actors/boo/geo.inc.c b/actors/boo/geo.inc.c
index 4fa9721b..646b167c 100644
--- a/actors/boo/geo.inc.c
+++ b/actors/boo/geo.inc.c
@@ -12,6 +12,5 @@ const GeoLayout boo_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
diff --git a/actors/boo_castle/geo.inc.c b/actors/boo_castle/geo.inc.c
index 1b3ee4f3..d6602e10 100644
--- a/actors/boo_castle/geo.inc.c
+++ b/actors/boo_castle/geo.inc.c
@@ -12,6 +12,5 @@ const GeoLayout boo_castle_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
diff --git a/actors/bookend/geo.inc.c b/actors/bookend/geo.inc.c
index b5629c8d..0d857f14 100644
--- a/actors/bookend/geo.inc.c
+++ b/actors/bookend/geo.inc.c
@@ -24,6 +24,5 @@ const GeoLayout bookend_part_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
diff --git a/actors/bowser_key/geo.inc.c b/actors/bowser_key/geo.inc.c
index 75fa63a9..8dc5cc44 100644
--- a/actors/bowser_key/geo.inc.c
+++ b/actors/bowser_key/geo.inc.c
@@ -26,6 +26,5 @@ const GeoLayout bowser_key_cutscene_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
diff --git a/actors/chain_chomp/geo.inc.c b/actors/chain_chomp/geo.inc.c
index ad336773..91a32781 100644
--- a/actors/chain_chomp/geo.inc.c
+++ b/actors/chain_chomp/geo.inc.c
@@ -17,6 +17,5 @@ const GeoLayout chain_chomp_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
diff --git a/actors/chair/geo.inc.c b/actors/chair/geo.inc.c
index eb963a7e..7a836ff6 100644
--- a/actors/chair/geo.inc.c
+++ b/actors/chair/geo.inc.c
@@ -24,6 +24,5 @@ const GeoLayout haunted_chair_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
diff --git a/actors/door/geo.inc.c b/actors/door/geo.inc.c
index 81c017d1..02ca7ac6 100644
--- a/actors/door/geo.inc.c
+++ b/actors/door/geo.inc.c
@@ -21,8 +21,7 @@ const GeoLayout castle_door_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
 
 // 0x1600043C
@@ -48,8 +47,7 @@ const GeoLayout cabin_door_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
 
 // 0x160004D0
@@ -75,8 +73,7 @@ const GeoLayout wooden_door_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
 
 // 0x16000564
@@ -102,8 +99,7 @@ const GeoLayout wooden_door2_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
 
 // 0x160005F8
@@ -129,8 +125,7 @@ const GeoLayout metal_door_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
 
 // 0x1600068C
@@ -156,8 +151,7 @@ const GeoLayout hazy_maze_door_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
 
 // 0x16000720
@@ -183,8 +177,7 @@ const GeoLayout haunted_door_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
 
 // 0x160007B4
@@ -216,8 +209,7 @@ const GeoLayout castle_door_0_star_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
 
 // 0x16000868
@@ -249,8 +241,7 @@ const GeoLayout castle_door_1_star_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
 
 // 0x1600091C
@@ -282,8 +273,7 @@ const GeoLayout castle_door_3_stars_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
 
 // 0x160009D0
@@ -315,6 +305,5 @@ const GeoLayout key_door_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
diff --git a/actors/dorrie/geo.inc.c b/actors/dorrie/geo.inc.c
index 23fd462c..f46b17e9 100644
--- a/actors/dorrie/geo.inc.c
+++ b/actors/dorrie/geo.inc.c
@@ -49,6 +49,5 @@ const GeoLayout dorrie_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
diff --git a/actors/hoot/geo.inc.c b/actors/hoot/geo.inc.c
index f66e8cfd..3e827e3c 100644
--- a/actors/hoot/geo.inc.c
+++ b/actors/hoot/geo.inc.c
@@ -57,6 +57,5 @@ const GeoLayout hoot_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
diff --git a/actors/king_bobomb/geo.inc.c b/actors/king_bobomb/geo.inc.c
index 5b7ced61..7611eccb 100644
--- a/actors/king_bobomb/geo.inc.c
+++ b/actors/king_bobomb/geo.inc.c
@@ -115,6 +115,5 @@ const GeoLayout king_bobomb_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
diff --git a/actors/mad_piano/geo.inc.c b/actors/mad_piano/geo.inc.c
index 70dea53e..b0be418c 100644
--- a/actors/mad_piano/geo.inc.c
+++ b/actors/mad_piano/geo.inc.c
@@ -16,6 +16,5 @@ const GeoLayout mad_piano_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
diff --git a/actors/moneybag/geo.inc.c b/actors/moneybag/geo.inc.c
index 2d1db035..ab741d48 100644
--- a/actors/moneybag/geo.inc.c
+++ b/actors/moneybag/geo.inc.c
@@ -52,8 +52,7 @@ const GeoLayout moneybag_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
 
 UNUSED static const u64 moneybag_unused_1 = 0;
diff --git a/actors/snufit/geo.inc.c b/actors/snufit/geo.inc.c
index a8aabecc..4d471752 100644
--- a/actors/snufit/geo.inc.c
+++ b/actors/snufit/geo.inc.c
@@ -22,6 +22,5 @@ const GeoLayout snufit_geo[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
diff --git a/levels/castle_grounds/areas/1/11/geo.inc.c b/levels/castle_grounds/areas/1/11/geo.inc.c
index e5127f1d..e1b15a09 100644
--- a/levels/castle_grounds/areas/1/11/geo.inc.c
+++ b/levels/castle_grounds/areas/1/11/geo.inc.c
@@ -22,6 +22,5 @@ const GeoLayout castle_grounds_geo_000660[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
    GEO_CLOSE_NODE(),
-GEO_CLOSE_NODE(), //! more close than open nodes
-GEO_END(),
+   GEO_END(),
 };
diff --git a/levels/ttm/areas/1/14/geo.inc.c b/levels/ttm/areas/1/14/geo.inc.c
index 98ee9baa..d0097be8 100644
--- a/levels/ttm/areas/1/14/geo.inc.c
+++ b/levels/ttm/areas/1/14/geo.inc.c
@@ -7,6 +7,7 @@ const GeoLayout ttm_geo_000920[] = {
          GEO_DISPLAY_LIST(LAYER_OPAQUE, ttm_seg7_dl_0700DF78),
          GEO_OPEN_NODE(),
          GEO_CLOSE_NODE(),
-    //! Too many open nodes. Unfortunately not exploitable
-         GEO_END(),
+      GEO_CLOSE_NODE(),
+   GEO_CLOSE_NODE(),
+   GEO_END(),
 };
diff --git a/src/game/mario_actions_airborne.c b/src/game/mario_actions_airborne.c
index c0c3f727..e2088511 100644
--- a/src/game/mario_actions_airborne.c
+++ b/src/game/mario_actions_airborne.c
@@ -173,7 +173,7 @@ s32 check_horizontal_wind(struct MarioState *m) {
         if (speed > 48.0f) {
             m->slideVelX = m->slideVelX * 48.0f / speed;
             m->slideVelZ = m->slideVelZ * 48.0f / speed;
-            speed = 32.0f; //! This was meant to be 48?
+            speed = 48.0f;
         } else if (speed > 32.0f) {
             speed = 32.0f;
         }
diff --git a/src/game/obj_behaviors.c b/src/game/obj_behaviors.c
index 1580c413..81e9391e 100644
--- a/src/game/obj_behaviors.c
+++ b/src/game/obj_behaviors.c
@@ -181,8 +181,7 @@ s8 turn_obj_away_from_steep_floor(struct Surface *objFloor, f32 floorY, f32 objV
     f32 floor_nX, floor_nY, floor_nZ, objVelXCopy, objVelZCopy, objYawX, objYawZ;
 
     if (objFloor == NULL) {
-        //! (OOB Object Crash) TRUNC overflow exception after 36 minutes
-        o->oMoveAngleYaw += 32767.999200000002; /* ¯\_(ツ)_/¯ */
+        o->oMoveAngleYaw += 0x8000;
         return FALSE;
     }
 
@@ -194,8 +193,7 @@ s8 turn_obj_away_from_steep_floor(struct Surface *objFloor, f32 floorY, f32 objV
     if (floor_nY < 0.5 && floorY > o->oPosY) {
         objVelXCopy = objVelX;
         objVelZCopy = objVelZ;
-        turn_obj_away_from_surface(objVelXCopy, objVelZCopy, floor_nX, floor_nY, floor_nZ, &objYawX,
-                               &objYawZ);
+        turn_obj_away_from_surface(objVelXCopy, objVelZCopy, floor_nX, floor_nY, floor_nZ, &objYawX, &objYawZ);
         o->oMoveAngleYaw = atan2s(objYawZ, objYawX);
         return FALSE;
     }