diff --git a/EntranceShuffle.py b/EntranceShuffle.py
index 58b7acfd..50c9a0f6 100644
--- a/EntranceShuffle.py
+++ b/EntranceShuffle.py
@@ -3028,6 +3028,7 @@ mandatory_connections = [('Lake Hylia Central Island Pier', 'Lake Hylia Central
                          ('Dark Death Mountain Ledge Clip Spot', 'Dark Death Mountain Ledge'),
                          ('Zora Descent Clip Spot', 'Zoras River'),
                          ('Graveyard Ledge Clip Spot', 'Graveyard Ledge'),
+                         ('Graveyard Ledge Clip Spot', 'Kings Grave Area'),
                          ('Desert Northern Cliffs', 'Desert Ledge'),
                          ('Desert Northern Cliffs', 'Desert Ledge (Northeast)'),
                          ('Desert Northern Cliffs', 'Desert Palace Entrance (North) Spot'),
@@ -3056,6 +3057,7 @@ mandatory_connections = [('Lake Hylia Central Island Pier', 'Lake Hylia Central
 
 inverted_mandatory_connections = [('Lake Hylia Central Island Pier', 'Lake Hylia Central Island'), 
                                   ('Zoras River', 'Zoras River'), 
+                                  ('Graveyard Ledge Clip Spot', 'Kings Grave Area'),
                                   ('Kings Grave Outer Rocks', 'Kings Grave Area'),
                                   ('Kings Grave Inner Rocks', 'Light World'),
                                   ('Kakariko Well (top to bottom)', 'Kakariko Well (bottom)'),
diff --git a/InvertedRegions.py b/InvertedRegions.py
index c7966a21..4bd6b454 100644
--- a/InvertedRegions.py
+++ b/InvertedRegions.py
@@ -126,7 +126,7 @@ def create_inverted_regions(world, player):
         create_cave_region(player, 'Old Man House Back', 'a connector', None, ['Old Man House Exit (Top)', 'Old Man House Back to Front']),
         create_lw_region(player, 'Death Mountain', None, ['Old Man Cave (East)', 'Old Man House (Bottom)', 'Old Man House (Top)', 'Death Mountain Return Cave (East)', 'Spectacle Rock Cave', 
                                                   'Spectacle Rock Cave Peak', 'Spectacle Rock Cave (Bottom)', 'Broken Bridge (West)', 'Death Mountain Mirror Spot', 'Death Mountain Bunny Descent Mirror Spot',
-                                                  'Death Mountain Offset Mirror', 'Hera Ascent', 'Death Mountain Glitched Bridge', 'Death Mountain Descent']),
+                                                  'Death Mountain Offset Mirror', 'Hera Ascent', 'Death Mountain Glitched Bridge', 'Death Mountain Descent', 'Graveyard Ledge Clip Spot']),
         create_cave_region(player, 'Death Mountain Return Cave', 'a connector', None, ['Death Mountain Return Cave Exit (West)', 'Death Mountain Return Cave Exit (East)']),
         create_lw_region(player, 'Death Mountain Return Ledge', None, ['Death Mountain Return Ledge Drop', 'Death Mountain Return Cave (West)', 'Bumper Cave Ledge Mirror Spot']),
         create_cave_region(player, 'Spectacle Rock Cave (Top)', 'a connector', ['Spectacle Rock Cave'], ['Spectacle Rock Cave Drop', 'Spectacle Rock Cave Exit (Top)']),
diff --git a/OWGSets.py b/OWGSets.py
index 16207ca7..11fa7ea9 100644
--- a/OWGSets.py
+++ b/OWGSets.py
@@ -5,6 +5,7 @@ Helper functions to deliver entrance/exit/region sets to OWG rules.
 def get_immediately_accessible_entrances(world, player):
     '''
     Entrances that are available with no items at all.
+
     At this point, these are fake flipper spots.
     '''
     entrances = [
@@ -108,10 +109,12 @@ def get_boots_clip_exits_lw(inverted = False):
         'Desert Northern Cliffs',
         'Lake Hylia Island Clip Spot',
         'Death Mountain Descent',
+        'Graveyard Ledge Clip Spot',
+        # Also requires a waterwalk setup, but the point still remains.
+        'Waterfall of Wishing',
         ]
     if not inverted:
         exits.append('Spectacle Rock Clip Spot')
-        exits.append('Graveyard Ledge Clip Spot')
         exits.append('Bombos Tablet Clip Spot')
         exits.append('Floating Island Clip Spot')
         exits.append('Cave 45 Clip Spot')
diff --git a/Rules.py b/Rules.py
index b172138a..79d67aa8 100644
--- a/Rules.py
+++ b/Rules.py
@@ -954,11 +954,6 @@ def add_conditional_lamps(world, player):
         add_lamp_requirement(world.get_entrance('Throne Room', player), player)
 
 def overworld_glitches_rules(world, player):
-    # @TODO: Waterfall fairy and Zora ledge could use some logic to determine
-    # if we can water walk and/or stored water walk in; currently it's omitted
-    # in case no interiors provide a water walk, but one could be kicking
-    # around. We could detect a path to determine if one can be stored.
-
     # Spots that are immediately accessible.
     for entrance in OWGSets.get_immediately_accessible_entrances(world, player):
         set_rule(world.get_entrance(entrance, player), lambda state: True)