diff --git a/DoorShuffle.py b/DoorShuffle.py
index be4c9182..7c2f3c10 100644
--- a/DoorShuffle.py
+++ b/DoorShuffle.py
@@ -1910,6 +1910,7 @@ def determine_init_crystal(initial, state, start_regions):
         return CrystalBarrier.Orange
     else:
         raise Exception(f'Can\'t get to {start_region.name} from initial state')
+#        raise Exception(f'Can\'t get to {start_region.name} from initial state\n{state.dungeon}\n{state.found_locations}')
 
 
 def explore_state(state, world, player):
@@ -2401,11 +2402,11 @@ interior_doors = [
     ('Desert Sandworm Corner NE', 'Desert Bonk Torch SE'),
     ('Desert Sandworm Corner WS', 'Desert Circle of Pots ES'),
     ('Desert Circle of Pots NW', 'Desert Big Chest SW'),
-    ('Desert West Wing WS', 'Desert West Lobby ES',),
+    ('Desert West Wing WS', 'Desert West Lobby ES'),
     ('Desert Fairy Fountain SW', 'Desert West Lobby NW'),
     ('Desert Back Lobby NW', 'Desert Tiles 1 SW'),
     ('Desert Bridge SW', 'Desert Four Statues NW'),
-    ('Desert Four Statues ES', 'Desert Beamos Hall WS',),
+    ('Desert Four Statues ES', 'Desert Beamos Hall WS'),
     ('Desert Tiles 2 NE', 'Desert Wall Slide SE'),
     ('Hera Tile Room EN', 'Hera Tridorm WN'),
     ('Hera Tridorm SE', 'Hera Torches NE'),
diff --git a/Regions.py b/Regions.py
index e2226e86..3f0cc6f1 100644
--- a/Regions.py
+++ b/Regions.py
@@ -500,7 +500,7 @@ def create_dungeon_regions(world, player):
         create_dungeon_region(player, 'Skull Big Key', 'Skull Woods', ['Skull Woods - Big Key Chest'], ['Skull Big Key SW', 'Skull Big Key WN']),
         create_dungeon_region(player, 'Skull Lone Pot', 'Skull Woods', None, ['Skull Lone Pot EN']),
         create_dungeon_region(player, 'Skull Small Hall', 'Skull Woods', None, ['Skull Small Hall ES', 'Skull Small Hall WS']),
-        create_dungeon_region(player, 'Skull Back Drop', 'Skull Woods', None, ['Skull Back Drop Star Path', ]),
+        create_dungeon_region(player, 'Skull Back Drop', 'Skull Woods', None, ['Skull Back Drop Star Path']),
         create_dungeon_region(player, 'Skull 2 West Lobby', 'Skull Woods', ['Skull Woods - West Lobby Pot Key'], ['Skull 2 West Lobby ES', 'Skull 2 West Lobby NW', 'Skull 2 West Lobby S']),
         create_dungeon_region(player, 'Skull X Room', 'Skull Woods', None, ['Skull X Room SW']),
         create_dungeon_region(player, 'Skull 3 Lobby', 'Skull Woods', None, ['Skull 3 Lobby NW', 'Skull 3 Lobby EN', 'Skull 3 Lobby SW']),
diff --git a/Rules.py b/Rules.py
index 7e37f4a2..78821d35 100644
--- a/Rules.py
+++ b/Rules.py
@@ -1671,7 +1671,7 @@ bunny_impassible_doors = {
     'Swamp Hub Hook Path', 'Swamp Compass Donut Push Block', 'Swamp Shortcut Blue Barrier', 'Swamp Trench 2 Pots Blue Barrier',
     'Swamp Trench 2 Pots Wet', 'Swamp Trench 2 Departure Wet', 'Swamp West Ledge Hook Path', 'Swamp Barrier Ledge Hook Path',
     'Swamp Attic Left Pit', 'Swamp Attic Right Pit', 'Swamp Push Statue NW', 'Swamp Push Statue NE',
-    'Swamp Drain Right Switch', 'Swamp Waterway NE', 'Swamp Waterway N', 'Swamp Waterway NW',
+    'Swamp Drain Right Switch', 'Swamp Waterway NE', 'Swamp Waterway N', 'Swamp Waterway NW', 
     'Skull Pot Circle WN', 'Skull Pot Circle Star Path', 'Skull Pull Switch S', 'Skull Big Chest N',
     'Skull Big Chest Hookpath', 'Skull 2 East Lobby NW', 'Skull Back Drop Star Path', 'Skull 2 West Lobby NW',
     'Skull 3 Lobby EN', 'Skull Star Pits SW', 'Skull Star Pits ES', 'Skull Torch Room WN', 'Skull Vines NW',