diff --git a/region/brinstar/blue/Blue Brinstar Energy Tank Room.json b/region/brinstar/blue/Blue Brinstar Energy Tank Room.json
index decac4372c..da6e755d25 100644
--- a/region/brinstar/blue/Blue Brinstar Energy Tank Room.json	
+++ b/region/brinstar/blue/Blue Brinstar Energy Tank Room.json	
@@ -588,9 +588,13 @@
       "name": "Ceiling Item Jump Into IBJ",
       "requires": [
         "canJumpIntoIBJ",
-        "canDoubleBombJump"
+        "canTrickyJump"
       ],
-      "note": "An alternate strat to canBombAboveIBJ. Shoot the block, jump into an IBJ, then do a quick double bomb jump to make it in time."
+      "note": [
+        "Shoot the block, jump into an IBJ, gaining height quickly enough to make it in time.",
+        "This can be done with as few as 2 bombs,",
+        "in which case it is similar to the start of a double bomb jump."
+      ]
     },
     {
       "id": 23,
diff --git a/region/lowernorfair/west/Screw Attack Room.json b/region/lowernorfair/west/Screw Attack Room.json
index 925f0a0e4c..a14e97739f 100644
--- a/region/lowernorfair/west/Screw Attack Room.json	
+++ b/region/lowernorfair/west/Screw Attack Room.json	
@@ -92,7 +92,12 @@
     },
     {
       "id": "B",
-      "name": "Bottom Bomb Blocks",
+      "name": "Some Bottom Bomb Blocks",
+      "obstacleType": "inanimate"
+    },
+    {
+      "id": "C",
+      "name": "All Bottom Bomb Blocks",
       "obstacleType": "inanimate"
     }
   ],
@@ -150,6 +155,7 @@
     {
       "from": 5,
       "to": [
+        {"id": 1},
         {"id": 2},
         {"id": 3},
         {"id": 4},
@@ -201,29 +207,31 @@
         "h_heatedCrystalFlash",
         {"heatFrames": 10}
       ],
-      "clearsObstacles": ["B"],
+      "clearsObstacles": ["B", "C"],
       "flashSuitChecked": true
     },
     {
       "id": 3,
       "link": [1, 2],
-      "name": "Shinespark",
+      "name": "Come in Shinecharged, Shinespark",
       "entranceCondition": {
         "comeInShinecharged": {}
       },
       "requires": [
-        {"shineChargeFrames": 25},
-        "h_navigateHeatRooms",
-        {"heatFrames": 200},
+        {"shineChargeFrames": 5},
+        {"heatFrames": 180},
         {"shinespark": {"frames": 31, "excessFrames": 10}}
       ],
       "clearsObstacles": ["B"],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "note": [
+        "Enter shinecharged, ideally with a low spin jump through the door."
+      ]
     },
     {
       "id": 76,
       "link": [1, 2],
-      "name": "Direct jump with Screw Attack",
+      "name": "Direct Jump with Screw Attack",
       "entranceCondition": {
         "comeInJumping": {
           "speedBooster": true,
@@ -248,7 +256,7 @@
     {
       "id": 77,
       "link": [1, 2],
-      "name": "Direct jump with SpeedBooster",
+      "name": "Direct Jump with Speed Booster",
       "entranceCondition": {
         "comeInGettingBlueSpeed": {
           "length": 0,
@@ -423,8 +431,8 @@
         "comeInShinecharged": {}
       },
       "requires": [
-        {"shineChargeFrames": 35},
-        {"heatFrames": 210},
+        {"shineChargeFrames": 40},
+        {"heatFrames": 220},
         {"or": [
           {"shinespark": {"frames": 41, "excessFrames": 4}},
           {"and": [
@@ -449,7 +457,9 @@
       ],
       "flashSuitChecked": true,
       "note": "Climb up 2 screens.",
-      "devNote": "Heat frames split into the actual climb and the setup in the adjacent room."
+      "devNote": [
+        "FIXME: The heatFrames for this and almost all other heated X-ray climbs are much too loose."
+      ]
     },
     {
       "id": 6,
@@ -568,8 +578,7 @@
       "link": [1, 4],
       "name": "Base",
       "requires": [
-        "h_navigateHeatRooms",
-        {"heatFrames": 60}
+        {"heatFrames": 55}
       ]
     },
     {
@@ -729,7 +738,7 @@
     {
       "id": 78,
       "link": [1, 5],
-      "name": "Direct jump with Screw Attack",
+      "name": "Direct Jump with Screw Attack",
       "entranceCondition": {
         "comeInJumping": {
           "speedBooster": true,
@@ -748,7 +757,7 @@
     {
       "id": 79,
       "link": [1, 5],
-      "name": "Direct jump with SpeedBooster",
+      "name": "Direct Jump with Speed Booster",
       "entranceCondition": {
         "comeInGettingBlueSpeed": {
           "length": 0,
@@ -818,9 +827,12 @@
         ]},
         {"heatFrames": 80}
       ],
-      "clearsObstacles": ["B"],
+      "clearsObstacles": ["B", "C"],
       "flashSuitChecked": true,
-      "note": "Bomb the blocks before exiting G-mode and jumping through."
+      "note": "Bomb the blocks before exiting G-mode and jumping through.",
+      "devNote": [
+        "FIXME: If Bombs are available (vs. Power Bombs), it's not necessary to break all the bottom blocks."
+      ]
     },
     {
       "id": 122,
@@ -1002,7 +1014,7 @@
       "requires": [
         "canPrepareForNextRoom",
         "canCarefulJump",
-        {"heatFrames": 55},
+        {"heatFrames": 40},
         {"doorUnlockedAtNode": 2}
       ],
       "unlocksDoors": [
@@ -1024,6 +1036,40 @@
       ],
       "unlocksDoors": [{"types": ["ammo"], "requires": []}]
     },
+    {
+      "link": [2, 2],
+      "name": "Power Bomb Top Blocks",
+      "requires": [
+        "canCarefulJump",
+        "canMidAirMorph",
+        "h_usePowerBomb",
+        {"heatFrames": 150}
+      ],
+      "clearsObstacles": ["A"],
+      "note": [
+        "Jump and lay a Power Bomb mid-air, to break the top bomb blocks.",
+        "With a quick mid-air morph, the Power Bomb can be laid from within the top tile of the doorway;",
+        "alternatively, Samus can jump away from the doorway and lay it higher."
+      ],
+      "devNote": [
+        "The heat frames include time for the Power Bomb explosion to progress far enough",
+        "to not interfere with pausing for a spring ball jump afterward."
+      ]
+    },
+    {
+      "link": [2, 2],
+      "name": "Springwall with Bombs",
+      "requires": [
+        "canSpringwall",
+        "h_useMorphBombs",
+        {"heatFrames": 190}
+      ],
+      "clearsObstacles": ["A"],
+      "note": [
+        "Use a wall jump into spring ball jump to break one of the bomb blocks above.",
+        "Then land back in the doorway."
+      ]
+    },
     {
       "id": 14,
       "link": [2, 2],
@@ -1032,7 +1078,7 @@
         {"heatFrames": 40},
         "h_heatedCrystalFlash"
       ],
-      "clearsObstacles": ["B"],
+      "clearsObstacles": ["B", "C"],
       "flashSuitChecked": true
     },
     {
@@ -1089,7 +1135,30 @@
     {
       "id": 17,
       "link": [2, 3],
-      "name": "Space Screw",
+      "name": "Space Screw (Air Entry)",
+      "entranceCondition": {
+        "comeInJumping": {
+          "minTiles": 0.4375,
+          "speedBooster": "any"
+        }
+      },
+      "requires": [
+        "canPrepareForNextRoom",
+        "SpaceJump",
+        "ScrewAttack",
+        {"or": [
+          {"heatFrames": 180},
+          {"and": [
+            "HiJump",
+            {"heatFrames": 125}
+          ]}
+        ]}
+      ],
+      "clearsObstacles": ["A"]
+    },
+    {
+      "link": [2, 3],
+      "name": "Space Screw (Water Entry)",
       "entranceCondition": {
         "comeInNormally": {}
       },
@@ -1097,14 +1166,29 @@
         "canPrepareForNextRoom",
         "SpaceJump",
         "ScrewAttack",
-        {"heatFrames": 200}
+        {"or": [
+          {"heatFrames": 250},
+          {"and": [
+            "HiJump",
+            {"heatFrames": 170}
+          ]}
+        ]}
       ],
       "clearsObstacles": ["A"]
     },
+    {
+      "link": [2, 3],
+      "name": "Springwall",
+      "requires": [
+        {"obstaclesCleared": ["A"]},
+        "canSpringwall",
+        {"heatFrames": 170}
+      ]
+    },
     {
       "id": 18,
       "link": [2, 3],
-      "name": "Doorway Speedjump",
+      "name": "Doorway Speedy Jump",
       "requires": [
         {"obstaclesCleared": ["A"]},
         "HiJump",
@@ -1196,7 +1280,7 @@
     {
       "id": 21,
       "link": [2, 3],
-      "name": "Transition Screwjump",
+      "name": "Transition Screw Jump",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,
@@ -1204,7 +1288,7 @@
         }
       },
       "requires": [
-        {"notable": "Transition Screwjump"},
+        {"notable": "Transition Screw Jump"},
         "h_navigateHeatRooms",
         "ScrewAttack",
         "HiJump",
@@ -1217,7 +1301,7 @@
     {
       "id": 80,
       "link": [2, 3],
-      "name": "Transition Screwjump (Tricky Jump)",
+      "name": "Transition Screw Jump (Tricky Jump)",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,
@@ -1225,7 +1309,7 @@
         }
       },
       "requires": [
-        {"notable": "Transition Screwjump"},
+        {"notable": "Transition Screw Jump"},
         "h_navigateHeatRooms",
         "ScrewAttack",
         "HiJump",
@@ -1239,7 +1323,7 @@
     {
       "id": 81,
       "link": [2, 3],
-      "name": "Transition Screwjump (No Walljump)",
+      "name": "Transition Screw Jump (No Walljump)",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,
@@ -1247,7 +1331,7 @@
         }
       },
       "requires": [
-        {"notable": "Transition Screwjump"},
+        {"notable": "Transition Screw Jump"},
         "h_navigateHeatRooms",
         "ScrewAttack",
         "HiJump",
@@ -1259,7 +1343,7 @@
     {
       "id": 22,
       "link": [2, 3],
-      "name": "Transition Screwjump (Tricky Dash Jump)",
+      "name": "Transition Screw Jump (Tricky Dash Jump)",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,
@@ -1267,7 +1351,7 @@
         }
       },
       "requires": [
-        {"notable": "Transition Screwjump"},
+        {"notable": "Transition Screw Jump"},
         "h_navigateHeatRooms",
         "ScrewAttack",
         "HiJump",
@@ -1276,7 +1360,10 @@
         {"heatFrames": 150}
       ],
       "clearsObstacles": ["A"],
-      "note": "Run through the doorway with enough momentum to break the bomb blocks with Screw."
+      "note": "Run through the doorway with enough momentum to break the bomb blocks with Screw.",
+      "devNote": [
+        "FIXME: Add option(s) to break the blocks with Screw Attack and then fall down."
+      ]
     },
     {
       "id": 23,
@@ -1795,7 +1882,7 @@
     {
       "id": 34,
       "link": [2, 5],
-      "name": "Transition Speedjump with Bombs",
+      "name": "Transition Speedy Jump with Bombs",
       "entranceCondition": {
         "comeInJumping": {
           "speedBooster": true,
@@ -1803,11 +1890,11 @@
         }
       },
       "requires": [
-        {"notable": "Transition Speedjump with Bombs"},
+        {"notable": "Transition Speedy Jump with Bombs"},
         "HiJump",
         "canMidAirMorph",
         "h_useMorphBombs",
-        {"heatFrames": 200}
+        {"heatFrames": 155}
       ],
       "clearsObstacles": ["A"],
       "note": "Run in the adjacent room and jump through the door, to place a Bomb to break the top bomb blocks."
@@ -1815,7 +1902,7 @@
     {
       "id": 35,
       "link": [2, 5],
-      "name": "Transition Speedjump with Bombs (Tricky Dash Jump)",
+      "name": "Transition Speedy Jump with Bombs (Tricky Dash Jump)",
       "entranceCondition": {
         "comeInJumping": {
           "speedBooster": true,
@@ -1823,12 +1910,12 @@
         }
       },
       "requires": [
-        {"notable": "Transition Speedjump with Bombs"},
+        {"notable": "Transition Speedy Jump with Bombs"},
         "HiJump",
         "canTrickyDashJump",
         "canMidAirMorph",
         "h_useMorphBombs",
-        {"heatFrames": 200}
+        {"heatFrames": 155}
       ],
       "clearsObstacles": ["A"],
       "note": "Run in the adjacent room and jump through the door, to place a Bomb to break the top bomb blocks."
@@ -1932,9 +2019,12 @@
         ]},
         {"heatFrames": 0}
       ],
-      "clearsObstacles": ["B"],
+      "clearsObstacles": ["B", "C"],
       "flashSuitChecked": true,
-      "note": "Bomb the blocks before exiting G-mode and jumping through."
+      "note": "Bomb the blocks before exiting G-mode and jumping through.",
+      "devNote": [
+        "FIXME: If Bombs are available (vs. Power Bombs), it's not necessary to break all the bottom blocks."
+      ]
     },
     {
       "id": 127,
@@ -2033,9 +2123,12 @@
         "h_additionalBomb",
         {"heatFrames": 0}
       ],
-      "clearsObstacles": ["A", "B"],
+      "clearsObstacles": ["A", "B", "C"],
       "flashSuitChecked": true,
-      "note": "Bomb all the blocks before exiting G-mode near the lower bomb blocks."
+      "note": "Bomb all the blocks before exiting G-mode near the lower bomb blocks.",
+      "devNote": [
+        "FIXME: If Bombs are available (vs. Power Bombs), it's not necessary to break all the bottom blocks."
+      ]
     },
     {
       "id": 130,
@@ -2067,11 +2160,14 @@
         "h_additionalBomb",
         {"heatFrames": 0}
       ],
-      "clearsObstacles": ["A", "B"],
+      "clearsObstacles": ["A", "B", "C"],
       "flashSuitChecked": true,
       "note": [
         "Bomb all the blocks before exiting G-mode near the lower bomb blocks.",
         "It is possible to fall back onto the door shell with artificial morph, then use Spring Ball to place a Power Bomb high enough."
+      ],
+      "devNote": [
+        "FIXME: If Bombs are available (vs. Power Bombs), it's not necessary to break all the bottom blocks."
       ]
     },
     {
@@ -2479,18 +2575,25 @@
       "name": "Temporary Blue (Full Runway)",
       "entranceCondition": {
         "comeInShinecharging": {
-          "length": 12,
+          "length": 11,
           "openEnd": 0
         }
       },
       "requires": [
         "canTemporaryBlue",
         "canXRayTurnaround",
-        {"heatFrames": 285}
+        {"heatFrames": 160},
+        {"or": [
+          "canXRayCancelShinecharge",
+          {"heatFrames": 160}
+        ]}
       ],
       "clearsObstacles": ["A", "B"],
       "flashSuitChecked": true,
-      "note": "This expects the more controlled Temporary Blue to fall though the blocks, not storing a shinecharge on the first breakable block."
+      "note": "This expects the more controlled Temporary Blue to fall though the blocks, not storing a shinecharge on the first breakable block.",
+      "devNote": [
+        "A significant amount of heat frames are implicit in the entrance condition."
+      ]
     },
     {
       "id": 44,
@@ -2504,7 +2607,11 @@
       },
       "requires": [
         "canTemporaryBlue",
-        {"heatFrames": 240}
+        {"heatFrames": 160},
+        {"or": [
+          "canXRayCancelShinecharge",
+          {"heatFrames": 160}
+        ]}
       ],
       "clearsObstacles": ["A", "B"],
       "flashSuitChecked": true,
@@ -2660,7 +2767,7 @@
       "name": "Power Bombs",
       "requires": [
         "h_usePowerBomb",
-        {"heatFrames": 220}
+        {"heatFrames": 195}
       ],
       "clearsObstacles": ["A"]
     },
@@ -2670,7 +2777,7 @@
       "name": "Bombs",
       "requires": [
         "h_useMorphBombs",
-        {"heatFrames": 220}
+        {"heatFrames": 185}
       ],
       "clearsObstacles": ["A"]
     },
@@ -2685,7 +2792,7 @@
         }
       },
       "requires": [
-        {"heatFrames": 120}
+        {"heatFrames": 110}
       ],
       "clearsObstacles": ["A"],
       "devNote": "FIXME: Running in is not required. Entering the room with canBlueSpaceJump could work, for example."
@@ -2918,6 +3025,77 @@
       ],
       "clearsObstacles": ["A", "B"]
     },
+    {
+      "link": [4, 3],
+      "name": "IBJ",
+      "requires": [
+        {"obstaclesCleared": ["B", "C"]},
+        "canLongIBJ",
+        {"or": [
+          {"heatFrames": 2090},
+          {"and": [
+            "canJumpIntoIBJ",
+            {"or": [
+              {"heatFrames": 1510},
+              {"and": [
+                "canDoubleBombJump",
+                {"heatFrames": 980}
+              ]},
+              {"and": [
+                "HiJump",
+                "canDoubleBombJump",
+                {"heatFrames": 860}
+              ]}
+            ]}
+          ]}
+        ]},
+        {"or": [
+          {"obstaclesCleared": ["A"]},
+          "canPowerBombMidIBJ",
+          {"and": [
+            "canBombAboveIBJ",
+            {"heatFrames": 60}
+          ]}
+        ]}
+      ],
+      "clearsObstacles": ["A"],
+      "devNote": [
+        "This assumes the bottom bomb blocks are completely broken,",
+        "making it necessary to start the IBJ from the bottom of the room."
+      ]
+    },
+    {
+      "link": [4, 4],
+      "name": "IBJ to Break the Top Blocks",
+      "requires": [
+        {"obstaclesCleared": ["B", "C"]},
+        "canLongIBJ",
+        {"or": [
+          {"heatFrames": 2120},
+          {"and": [
+            "canJumpIntoIBJ",
+            {"or": [
+              {"heatFrames": 1540},
+              {"and": [
+                "canDoubleBombJump",
+                {"heatFrames": 1010}
+              ]},
+              {"and": [
+                "HiJump",
+                "canDoubleBombJump",
+                {"heatFrames": 890}
+              ]}
+            ]}
+          ]}
+        ]}
+      ],
+      "clearsObstacles": ["A"],
+      "note": "This expects that Samus falls down afterwards.",
+      "devNote": [
+        "This assumes the bottom bomb blocks are completely broken,",
+        "making it necessary to start the IBJ from the bottom of the room."
+      ]
+    },
     {
       "id": 57,
       "link": [4, 4],
@@ -2925,7 +3103,7 @@
       "requires": [
         "h_heatedCrystalFlash"
       ],
-      "clearsObstacles": ["B"],
+      "clearsObstacles": ["B", "C"],
       "flashSuitChecked": true
     },
     {
@@ -2933,7 +3111,7 @@
       "link": [4, 5],
       "name": "Lower Bomb Blocks Already Broken",
       "requires": [
-        {"heatFrames": 120},
+        {"heatFrames": 70},
         {"obstaclesCleared": ["B"]}
       ]
     },
@@ -2943,7 +3121,7 @@
       "name": "Screw",
       "requires": [
         "ScrewAttack",
-        {"heatFrames": 120}
+        {"heatFrames": 70}
       ],
       "clearsObstacles": ["B"]
     },
@@ -2953,9 +3131,9 @@
       "name": "Power Bomb",
       "requires": [
         "h_usePowerBomb",
-        {"heatFrames": 220}
+        {"heatFrames": 170}
       ],
-      "clearsObstacles": ["B"]
+      "clearsObstacles": ["B", "C"]
     },
     {
       "id": 61,
@@ -2967,7 +3145,34 @@
           "h_useSpringBall"
         ]},
         "h_useMorphBombs",
-        {"heatFrames": 220}
+        {"heatFrames": 200}
+      ],
+      "clearsObstacles": ["B"]
+    },
+    {
+      "link": [5, 1],
+      "name": "Base",
+      "requires": [
+        "ScrewAttack",
+        {"heatFrames": 90}
+      ],
+      "clearsObstacles": ["B"]
+    },
+    {
+      "link": [5, 1],
+      "name": "Power Bomb",
+      "requires": [
+        "h_usePowerBomb",
+        {"heatFrames": 140}
+      ],
+      "clearsObstacles": ["B", "C"]
+    },
+    {
+      "link": [5, 1],
+      "name": "Bombs",
+      "requires": [
+        "h_useMorphBombs",
+        {"heatFrames": 125}
       ],
       "clearsObstacles": ["B"]
     },
@@ -2976,20 +3181,34 @@
       "link": [5, 2],
       "name": "Base",
       "requires": [
-        {"heatFrames": 80},
         {"or": [
-          "HiJump",
-          "SpaceJump",
-          "canWalljump",
-          "h_crouchJumpDownGrab",
-          "canSpringBallJumpMidAir",
+          {"and": [
+            "HiJump",
+            {"heatFrames": 45}
+          ]},
+          {"and": [
+            "SpaceJump",
+            {"heatFrames": 80}
+          ]},
+          {"and": [
+            "canWalljump",
+            {"heatFrames": 50}
+          ]},
+          {"and": [
+            "h_crouchJumpDownGrab",
+            {"heatFrames": 65}
+          ]},
+          {"and": [
+            "canSpringBallJumpMidAir",
+            {"heatFrames": 80}
+          ]},
           {"and": [
             "canIBJ",
-            {"heatFrames": 440}
+            {"heatFrames": 520}
           ]},
           {"and": [
             "canJumpIntoIBJ",
-            {"heatFrames": 80}
+            {"heatFrames": 160}
           ]}
         ]}
       ]
@@ -2999,27 +3218,31 @@
       "link": [5, 3],
       "name": "IBJ",
       "requires": [
-        {"obstaclesCleared": ["A"]},
-        "canLongIBJ",
-        {"heatFrames": 1300}
-      ],
-      "devNote": [
-        "FIXME: This is a longer IBJ if B is broken with a power bomb (All the blocks are broken).",
-        "FIXME: Add more IBJ variations."
-      ]
-    },
-    {
-      "id": 64,
-      "link": [5, 3],
-      "name": "IBJ to Break the Top Blocks",
-      "requires": [
-        "h_navigateHeatRooms",
+        {"obstaclesNotCleared": ["C"]},
+        "canJumpIntoIBJ",
         "canLongIBJ",
-        "canPowerBombMidIBJ",
-        {"heatFrames": 1300}
+        {"or": [
+          {"heatFrames": 1300},
+          {"and": [
+            "canDoubleBombJump",
+            {"heatFrames": 690}
+          ]},
+          {"and": [
+            "HiJump",
+            "canDoubleBombJump",
+            {"heatFrames": 590}
+          ]}
+        ]},
+        {"or": [
+          {"obstaclesCleared": ["A"]},
+          "canPowerBombMidIBJ",
+          {"and": [
+            "canBombAboveIBJ",
+            {"heatFrames": 60}
+          ]}
+        ]}
       ],
-      "clearsObstacles": ["A"],
-      "note": "Place a Power Bomb during the IBJ to break the blocks without falling."
+      "clearsObstacles": ["A"]
     },
     {
       "id": 65,
@@ -3031,7 +3254,13 @@
           {"obstaclesCleared": ["A"]},
           "ScrewAttack"
         ]},
-        {"heatFrames": 400}
+        {"or": [
+          {"heatFrames": 300},
+          {"and": [
+            "HiJump",
+            {"heatFrames": 200}
+          ]}
+        ]}
       ]
     },
     {
@@ -3041,7 +3270,7 @@
       "requires": [
         {"obstaclesCleared": ["A"]},
         "h_heatedSpringwall",
-        {"heatFrames": 245}
+        {"heatFrames": 200}
       ]
     },
     {
@@ -3068,7 +3297,7 @@
         "h_usePowerBomb",
         {"heatFrames": 140}
       ],
-      "clearsObstacles": ["B"]
+      "clearsObstacles": ["B", "C"]
     },
     {
       "id": 69,
@@ -3083,7 +3312,7 @@
     {
       "id": 70,
       "link": [5, 5],
-      "name": "Power Bombs",
+      "name": "Power Bomb to Break the Top Blocks",
       "requires": [
         "h_usePowerBomb",
         "canTrivialMidAirMorph",
@@ -3100,12 +3329,27 @@
       "link": [5, 5],
       "name": "IBJ to Break the Top Blocks",
       "requires": [
+        {"obstaclesNotCleared": ["C"]},
         "canLongIBJ",
-        {"heatFrames": 1150}
+        "canJumpIntoIBJ",
+        {"or": [
+          {"heatFrames": 1150},
+          {"and": [
+            "canDoubleBombJump",
+            {"heatFrames": 660}
+          ]},
+          {"and": [
+            "HiJump",
+            "canDoubleBombJump",
+            {"heatFrames": 540}
+          ]}
+        ]}
       ],
       "clearsObstacles": ["A"],
-      "note": "Expects that Samus falls down afterwards.",
-      "devNote": "FIXME: This assumes B is not broken, add other IBJ variants."
+      "note": "This expects that Samus falls down afterwards.",
+      "devNote": [
+        "This assumes the lower bomb blocks are not completely broken (due to having used a Power Bomb)."
+      ]
     },
     {
       "id": 72,
@@ -3115,9 +3359,19 @@
         "h_useMorphBombs",
         "SpaceJump",
         "canMidAirMorph",
-        {"heatFrames": 250}
+        {"or": [
+          {"heatFrames": 340},
+          {"and": [
+            "HiJump",
+            {"heatFrames": 250}
+          ]}
+        ]}
       ],
-      "clearsObstacles": ["A"]
+      "clearsObstacles": ["A"],
+      "devNote": [
+        "FIXME: add strats that enter spinning from node 2 and use Space Jump + Bombs to break the blocks;",
+        "consider both air and water entry."
+      ]
     },
     {
       "id": 73,
@@ -3126,7 +3380,7 @@
       "requires": [
         "h_useMorphBombs",
         "h_heatedSpringwall",
-        {"heatFrames": 250}
+        {"heatFrames": 220}
       ],
       "clearsObstacles": ["A"],
       "note": "Use a Springwall to get up to the bomb blocks, to break them with a bomb."
@@ -3139,19 +3393,19 @@
         {"heatFrames": 40},
         "h_heatedCrystalFlash"
       ],
-      "clearsObstacles": ["B"],
+      "clearsObstacles": ["B", "C"],
       "flashSuitChecked": true
     }
   ],
   "notables": [
     {
       "id": 2,
-      "name": "Transition Screwjump",
+      "name": "Transition Screw Jump",
       "note": "Run through the doorway with enough momentum to break the bomb blocks with Screw."
     },
     {
       "id": 3,
-      "name": "Transition Speedjump with Bombs",
+      "name": "Transition Speedy Jump with Bombs",
       "note": "Run in the adjacent room and jump through the door, to place a Bomb to break the obstacle."
     },
     {