diff --git a/Data/Map024.rxdata b/Data/Map024.rxdata
index 95a2cbc55..8649fe0ef 100644
Binary files a/Data/Map024.rxdata and b/Data/Map024.rxdata differ
diff --git a/Data/Map401.rxdata b/Data/Map401.rxdata
index 7db4aef56..f05f8ef8e 100644
Binary files a/Data/Map401.rxdata and b/Data/Map401.rxdata differ
diff --git a/Data/Map457.rxdata b/Data/Map457.rxdata
index 08398c557..e4a77242f 100644
Binary files a/Data/Map457.rxdata and b/Data/Map457.rxdata differ
diff --git a/Data/Map479.rxdata b/Data/Map479.rxdata
index 6b4e22652..d62b56685 100644
Binary files a/Data/Map479.rxdata and b/Data/Map479.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 6ee28db04..e21ee3cb3 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/001_Technical/001_Debugging/003_Errors.rb b/Data/Scripts/001_Technical/001_Debugging/003_Errors.rb
index 80d409a05..d744b325b 100644
--- a/Data/Scripts/001_Technical/001_Debugging/003_Errors.rb
+++ b/Data/Scripts/001_Technical/001_Debugging/003_Errors.rb
@@ -26,8 +26,16 @@ def pbPrintException(e)
     emessage = pbGetExceptionMessage(e)
   end
   # begin message formatting
-  message = "[Pokémon Essentials version #{Essentials::VERSION}]\r\n"
-  message += "#{Essentials::ERROR_TEXT}\r\n"   # For third party scripts to add to
+  message = "[Infinite Fusion version #{Settings::GAME_VERSION_NUMBER}]\r\n"
+  if $game_switches
+    message += "Randomized trainers, " if $game_switches[SWITCH_RANDOM_TRAINERS]
+    message += "Randomized gym trainers, " if $game_switches[SWITCH_RANDOMIZE_GYMS_SEPARATELY]
+    message += "Randomized wild Pokemon (global), " if $game_switches[SWITCH_WILD_RANDOM_GLOBAL]
+    message += "Randomized wild Pokemon (area), " if $game_switches[RandomizerWildPokemonOptionsScene::RANDOM_WILD_AREA]
+    message += "All fused, " if $game_switches[SWITCH_RANDOM_TRAINERS]
+    message += "Randomized trainers, " if $game_switches[RandomizerWildPokemonOptionsScene::REGULAR_TO_FUSIONS]
+  end
+    message += "#{Essentials::ERROR_TEXT}\r\n"   # For third party scripts to add to
   message += "Exception: #{e.class}\r\n"
   message += "Message: #{emessage}\r\n"
   # show last 10/25 lines of backtrace
diff --git a/Data/Scripts/025-Randomizer/RandomizerUtils.rb b/Data/Scripts/025-Randomizer/RandomizerUtils.rb
index 65851fcaf..a696e0b4c 100644
--- a/Data/Scripts/025-Randomizer/RandomizerUtils.rb
+++ b/Data/Scripts/025-Randomizer/RandomizerUtils.rb
@@ -20,6 +20,8 @@ HELD_ITEMS = [:AIRBALLOON, :BRIGHTPOWDER, :EVIOLITE, :FLOATSTONE, :DESTINYKNOT,
               :PETAYABERRY, :APICOTBERRY, :LANSATBERRY, :STARFBERRY, :ENIGMABERRY, :MICLEBERRY, :CUSTAPBERRY,
               :JABOCABERRY, :ROWAPBERRY, :FAIRYGEM]
 
+ITEM_EXCEPTIONS= [:COVERFOSSIL, :PLUMEFOSSIL, :ACCURACYUP,:DAMAGEUP,:ANCIENTSTONE,:ODDKEYSTONE_FULL,:TM00 ]
+
 def pbGetRandomItem(item_id)
   return nil if item_id == nil
   item = GameData::Item.get(item_id)
@@ -41,7 +43,7 @@ def pbGetRandomItem(item_id)
   items_list = GameData::Item.list_all
   newItem_id = items_list.keys.sample
   newItem = GameData::Item.get(newItem_id)
-  while (newItem.is_machine? || newItem.is_key_item?)
+  while (newItem.is_machine? || newItem.is_key_item? || ITEM_EXCEPTIONS.include?(newItem))
     newItem_id = items_list.keys.sample
     newItem = GameData::Item.get(newItem_id)
   end
diff --git a/Data/Scripts/049_Compatibility/MarinUtilities.rb b/Data/Scripts/049_Compatibility/MarinUtilities.rb
index ea4275be8..91b01b5b1 100644
--- a/Data/Scripts/049_Compatibility/MarinUtilities.rb
+++ b/Data/Scripts/049_Compatibility/MarinUtilities.rb
@@ -1251,17 +1251,8 @@ end
 #     p_msg(msg, title, :question)
 #   end
 #
-#   trace_var(:$scene, proc do |object|
-#     break unless object
-#     unless object.instance_variable_get(:@__old_main)
-#       object.instance_variable_set(:@__old_main, object.method(:main))
-#       def object.main
-#         self.instance_variable_get(:@__old_main).call
-#       rescue
-#         p_err
-#       end
-#     end
-#   end)
+
+
 #
 # else
 #
diff --git a/Data/System.rxdata b/Data/System.rxdata
index d7896c5c8..9d3388857 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ