diff --git a/CLI.py b/CLI.py
index a3a72b8c..bab3e116 100644
--- a/CLI.py
+++ b/CLI.py
@@ -151,6 +151,7 @@ def parse_settings():
         "code": "",
         "multi": 1,
         "names": "",
+        "securerandom": False,
 
         # Hints default to TRUE
         "hints": True,
diff --git a/Doors.py b/Doors.py
index 4fec15d4..73806dd3 100644
--- a/Doors.py
+++ b/Doors.py
@@ -206,7 +206,7 @@ def create_doors(world, player):
         create_door(player, 'Desert East Wing Key Door EN', Intr).dir(Ea, 0x85, Top, High).small_key().pos(1),
         create_door(player, 'Desert Compass Key Door WN', Intr).dir(We, 0x85, Top, High).small_key().pos(1),
         create_door(player, 'Desert Compass NW', Nrml).dir(No, 0x85, Right, High).trap(0x4).pos(0),
-        create_door(player, 'Desert Cannonball S', Nrml).dir(So, 0x75, Right, High).pos(1).portal(Z, 0x02),
+        create_door(player, 'Desert Cannonball S', Nrml).dir(So, 0x75, Right, High).pos(1).portal(X, 0x02),
         create_door(player, 'Desert Arrow Pot Corner S Edge', Open).dir(So, 0x75, None, High).edge(6, Z, 0x20),
         create_door(player, 'Desert Arrow Pot Corner W Edge', Open).dir(We, 0x75, None, High).edge(2, Z, 0x20),
         create_door(player, 'Desert Arrow Pot Corner NW', Intr).dir(No, 0x75, Left, High).pos(0),
diff --git a/ItemList.py b/ItemList.py
index d9df9e2b..c9697f0a 100644
--- a/ItemList.py
+++ b/ItemList.py
@@ -512,6 +512,8 @@ def set_up_shops(world, player):
                 shop.add_inventory(1, 'Small Key (Universal)', 100)
                 shop.add_inventory(2, 'Bombs (10)', 50)
             rss.locked = True
+            cap_shop = world.get_region('Capacity Upgrade', player).shop
+            cap_shop.inventory[1] = None  # remove arrow capacity upgrades in retro
 
 
 def customize_shops(world, player):
@@ -599,7 +601,7 @@ def randomize_price(price):
 def change_shop_items_to_rupees(world, player, shops):
     locations = world.get_filled_locations(player)
     for location in locations:
-        if location.item.name in shop_transfer.keys() and location.parent_region.name not in shops:
+        if location.item.name in shop_transfer.keys() and (location.parent_region.name not in shops or location.name == 'Potion Shop'):
             new_item = ItemFactory(shop_transfer[location.item.name], location.item.player)
             location.item = new_item
         if location.parent_region.name == 'Capacity Upgrade' and location.item.name in cap_blacklist:
diff --git a/Main.py b/Main.py
index 3c845872..502a5ce7 100644
--- a/Main.py
+++ b/Main.py
@@ -26,7 +26,7 @@ from Fill import sell_potions, sell_keys, balance_multiworld_progression, balanc
 from ItemList import generate_itempool, difficulties, fill_prizes, customize_shops
 from Utils import output_path, parse_player_names
 
-__version__ = '0.3.1.1-u'
+__version__ = '0.3.1.2-u'
 
 
 class EnemizerError(RuntimeError):
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 6afd9029..320c89df 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -128,8 +128,16 @@ New item counter modified to show total
 
 # Bug Fixes and Notes.
 
+* 0.3.1.2-u
+	* Include base ER updates
+		* Goal sign should now indicate whether Aga 2 is required or not
+		* Inverted logic fixes
+	* Potion shop (powder) item not properly replaced with rupees
+	* Removed Arrow Capacity upgrades in retro
+	* Intensity level 3 fixes courtesy of Catobat
+	* Scrolling issue in Desert Cannonball
 * 0.3.1.1-u
-	* Potion shop crash in non-keysanity
+	* Potion shop crash in non-shopsanity
 * 0.3.1.0-u
 	* Shopsanity introduced
 	* Blind sequence restored when Blind is in Theives Town in boss shuffle
diff --git a/Rom.py b/Rom.py
index 6c47967e..5cc101b7 100644
--- a/Rom.py
+++ b/Rom.py
@@ -2014,7 +2014,7 @@ def write_strings(rom, world, player, team):
 
     prog_bow_locs = world.find_items('Progressive Bow', player)
     distinguished_prog_bow_loc = next((location for location in prog_bow_locs if location.item.code == 0x65), None)
-    progressive_silvers = world.difficulty_requirements.progressive_bow_limit >= 2 or world.swords == 'swordless'
+    progressive_silvers = world.difficulty_requirements[player].progressive_bow_limit >= 2 or world.swords[player] == 'swordless'
     if distinguished_prog_bow_loc:
         prog_bow_locs.remove(distinguished_prog_bow_loc)
         silverarrow_hint = (' %s?' % hint_text(distinguished_prog_bow_loc).replace('Ganon\'s', 'my')) if progressive_silvers else '?\nI think not!'