diff --git a/region/brinstar/red/Red Brinstar Fireflea Room.json b/region/brinstar/red/Red Brinstar Fireflea Room.json
index 2d919b77f..168e1e878 100644
--- a/region/brinstar/red/Red Brinstar Fireflea Room.json	
+++ b/region/brinstar/red/Red Brinstar Fireflea Room.json	
@@ -1901,15 +1901,27 @@
     {
       "id": 55,
       "link": [4, 1],
-      "name": "Ice and HiJump",
+      "name": "Frozen Waver Platform",
       "requires": [
         "canTrickyUseFrozenEnemies",
-        "HiJump",
-        "canCarefulJump"
+        "canCarefulJump",
+        {"or": [
+          "HiJump",
+          "canWallJump",
+          "canTrickyJump",
+          "canTrickySpringBallJump"
+        ]},
+        {"or": [
+          "canTrickyJump",
+          {"enemyDamage": {"enemy": "Waver", "type": "contact", "hits": 1}}
+        ]}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
-      "note": "Freeze the Waver that gets stuck in the left pit as high as possible in order to avoid a wall jump."
+      "note": [
+        "Freeze the Waver that gets stuck in the left pit to get to the top ledge.",
+        "It is possible to do this without a wall jump or any other items but it requires freezing it at a moderately precise height."
+      ]
     },
     {
       "id": 56,
diff --git a/region/crateria/west/Gauntlet Energy Tank Room.json b/region/crateria/west/Gauntlet Energy Tank Room.json
index 9a4c685c6..691034208 100644
--- a/region/crateria/west/Gauntlet Energy Tank Room.json	
+++ b/region/crateria/west/Gauntlet Energy Tank Room.json	
@@ -664,7 +664,7 @@
     {
       "id": 15,
       "link": [1, 4],
-      "name": "Shinespark in Room",
+      "name": "Come in Shinecharging, Shinespark",
       "entranceCondition": {
         "comeInShinecharging": {
           "length": 5,
@@ -687,7 +687,7 @@
     {
       "id": 16,
       "link": [1, 4],
-      "name": "Shinespark in Room, Kill Zebo on Entry",
+      "name": "Come in Shinecharging, Shinespark, Kill Zebo on Entry",
       "entranceCondition": {
         "comeInShinecharging": {
           "length": 14,
@@ -726,7 +726,7 @@
     {
       "id": 17,
       "link": [1, 4],
-      "name": "Blue Space Jump",
+      "name": "Come In Getting Blue Speed, Blue Space Jump",
       "entranceCondition": {
         "comeInGettingBlueSpeed": {
           "length": 5,
@@ -736,18 +736,15 @@
         }
       },
       "requires": [
-        "canBlueSpaceJump",
-        "canCarefulJump",
-        "h_complexToCarryFlashSuit"
+        "canBlueSpaceJump"
       ],
       "clearsObstacles": ["A", "B"],
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
     {
-      "id": 18,
       "link": [1, 4],
-      "name": "Blue Space Jump, Kill Zebo on Entry",
+      "name": "Come In Getting Blue Speed, Blue Space Jump, Kill Zebo on Entry",
       "entranceCondition": {
         "comeInGettingBlueSpeed": {
           "length": 14,
@@ -763,17 +760,54 @@
           "Gravity",
           {"acidFrames": 5}
         ]},
-        "canBlueSpaceJump",
-        "canCarefulJump"
+        "canBlueSpaceJump"
       ],
       "clearsObstacles": ["A", "B"],
       "flashSuitChecked": true,
-      "blueSuitChecked": true,
-      "note": "To use the full runway, kill the Zebbo with Wave.",
-      "devNote": [
-        "FIXME: Running through acid doesn't stop a shinecharge, but does inhibit tapping without gravity.",
-        "And the acid frame count may change slightly with speed."
-      ]
+      "blueSuitChecked": true
+    },
+    {
+      "link": [1, 4],
+      "name": "Blue Space Jump, In-Room Runway",
+      "requires": [
+        {"obstaclesCleared": ["B"]},
+        {"or": [
+          {"getBlueSpeed": {
+            "usedTiles": 14,
+            "steepUpTiles": 1,
+            "steepDownTiles": 1,
+            "openEnd": 0
+          }},
+          {"and": [
+            {"getBlueSpeed": {
+              "usedTiles": 15,
+              "steepUpTiles": 1,
+              "steepDownTiles": 1,
+              "openEnd": 0
+            }},
+            {"doorUnlockedAtNode": 1}
+          ]}
+        ]},
+        "canBlueSpaceJump"
+      ],
+      "clearsObstacles": ["A"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
+    {
+      "link": [1, 4],
+      "name": "Come In Blue Spinning, Blue Space Jump",
+      "entranceCondition": {
+        "comeInBlueSpinning": {
+          "unusableTiles": 0
+        }
+      },
+      "requires": [
+        "canBlueSpaceJump"
+      ],
+      "clearsObstacles": ["A", "B"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
     },
     {
       "id": 19,
diff --git a/region/maridia/inner-pink/West Sand Pit.json b/region/maridia/inner-pink/West Sand Pit.json
index f21c896cf..91945605a 100644
--- a/region/maridia/inner-pink/West Sand Pit.json	
+++ b/region/maridia/inner-pink/West Sand Pit.json	
@@ -703,18 +703,55 @@
         "Gravity",
         "h_useSpringBall",
         {"or": [
-          {"and": [
-            {"tech": "canJumpIntoIBJ"},
-            "h_bombThings"
-          ]},
           "canSpringBallBombJump",
           "HiJump"
         ]}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
-      "note": "Spring Ball bounce on top of the crumble blocks.  Use either a bomb or HiJump to gain a little bit of extra height.",
-      "devNote": "The tech requirement is `catching yourself on an aerial bomb` which is what canJumpIntoIBJ adds to canIBJ.  Only one bomb or powerbomb is needed."
+      "note": [
+        "With Spring Ball it is safe to bounce on top of the crumble blocks while continuing to jump.",
+        "Climb with HiJump, or use a bomb into Spring Ball jump to gain a little bit of extra height."
+      ]
+    },
+    {
+      "link": [7, 5],
+      "name": "Spring Ball into IBJ",
+      "requires": [
+        {"or": [
+          "Gravity",
+          "HiJump"
+        ]},
+        "h_useSpringBall",
+        "canJumpIntoIBJ"
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Spring Ball bounce on top of the crumble blocks. Time a Bomb above the water into the start of an IBJ.",
+        "With Gravity, this is possible with a single Bomb boost."
+      ]
+    },
+    {
+      "link": [7, 5],
+      "name": "Gravity, Spring Ball, Power Bomb Boost",
+      "requires": [
+        "Gravity",
+        "h_useSpringBall",
+        {"tech": "canJumpIntoIBJ"},
+        "canTrickyJump",
+        "h_usePowerBomb",
+        {"or": [
+          {"tech": "canUnmorphBombBoost"},
+          "h_additionalBomb"
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Spring Ball bounce on top of the crumble blocks. Land on a well-timed Power Bomb to boost up into the tunnel.",
+        "There is a 4-frame window to land on the Power Bomb, only the first frame will boost Samus high enough."
+      ]
     },
     {
       "id": 33,