diff --git a/BaseClasses.py b/BaseClasses.py
index 593ae269..6376ad64 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -3089,7 +3089,7 @@ class Spoiler(object):
             for fairy, bottle in self.bottles.items():
                 outfile.write(f'{fairy}: {bottle}\n')
 
-            if self.overworlds:
+            if self.overworlds or self.maps:
                 outfile.write('\n\nOverworld:\n\n')
 
                 # flute shuffle
@@ -3114,6 +3114,7 @@ class Spoiler(object):
                             outfile.write(str('(Player ' + str(player) + ')\n')) # player name
                         outfile.write(self.maps[('swaps', player)]['text'] + '\n\n')
 
+            if self.overworlds:
                 # overworld transitions
                 outfile.write('\n'.join(['%s%s %s %s' % (f'{self.world.get_player_names(entry["player"])}: ' if self.world.players > 1 else '', self.world.fish.translate("meta","overworlds",entry['entrance']), '<=>' if entry['direction'] == 'both' else '<=' if entry['direction'] == 'exit' else '=>', self.world.fish.translate("meta","overworlds",entry['exit'])) for entry in self.overworlds.values()]))
             
diff --git a/OverworldShuffle.py b/OverworldShuffle.py
index a3c588f4..7818607b 100644
--- a/OverworldShuffle.py
+++ b/OverworldShuffle.py
@@ -425,6 +425,7 @@ def link_overworld(world, player):
         connect_flutes(new_spots)
 
         # update spoiler
+        new_spots = list(map(lambda o: flute_data[o][1], new_spots))
         s = list(map(lambda x: ' ' if x not in new_spots else 'F', [i for i in range(0x40)]))
         text_output = tile_swap_spoiler_table.replace('s', '%s') % (                         s[0x02],                                s[0x07],
                                                                                  s[0x00],                s[0x03],        s[0x05],