diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 9386377..be72e2e 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -26,7 +26,7 @@ org $3FFFFF ; <- 1FFFFF
 db #$00 ; expand file to 2mb
 
 org $1FFFF8 ; <- FFFF8 timestamp rom
-db #$20, #$17, #$12, #$19 ; year/month/day
+db #$20, #$17, #$12, #$22 ; year/month/day
 
 ;================================================================================
 
@@ -385,6 +385,9 @@ Sprite_CheckDamageToPlayerSameLayerLong:
 org $06F86A
 OAM_AllocateDeferToPlayerLong:
 
+org $0791B3
+Player_HaltDashAttackLong:
+
 org $07999D
 Link_ReceiveItem:
 
diff --git a/hooks.asm b/hooks.asm
index b2549f5..6cfa8d0 100644
--- a/hooks.asm
+++ b/hooks.asm
@@ -389,10 +389,10 @@ org $07B08B
 LinkItem_MagicCostBaseIndices:
 ;--------------------------------------------------------------------------------
 org $07B096 ; <- 3B096 - Bank07.asm : 7731 (LDA LinkItem_MagicCostBaseIndices, X : CLC : ADC $7EF37B : TAX)
-JSL.l LoadModifiedMagicLevel : !ADD.w LinkItem_MagicCostBaseIndices
+JSL.l LoadModifiedMagicLevel : !ADD.w LinkItem_MagicCostBaseIndices, X
 ;--------------------------------------------------------------------------------
 org $07B0D5 ; <- 3B0D5 - Bank07.asm : 7783 (LDA LinkItem_MagicCostBaseIndices, X : CLC : ADC $7EF37B : TAX)
-JSL.l LoadModifiedMagicLevel : !ADD.w LinkItem_MagicCostBaseIndices
+JSL.l LoadModifiedMagicLevel : !ADD.w LinkItem_MagicCostBaseIndices, X
 ;--------------------------------------------------------------------------------
 
 ;================================================================================
diff --git a/stats.asm b/stats.asm
index 5a81ffb..9884e68 100644
--- a/stats.asm
+++ b/stats.asm
@@ -173,7 +173,9 @@ DungeonStairsTransition:
 	JSL Dungeon_SaveRoomQuadrantData
 	BRA StatTransitionCounter
 DungeonExitTransition:
-	LDA.b #$0F : STA $10
+	JSL Player_HaltDashAttackLong
+	LDA.b #$00 : STA $0301 ; stop item dashing
+	LDA.b #$0F : STA $10 ; stop running through the transition
 StatTransitionCounter:
 	PHA : PHP
 		LDA !LOCK_STATS : BNE +
@@ -195,12 +197,15 @@ RTL
 ;--------------------------------------------------------------------------------
 IncrementSmallKeys:
 	STA $7EF36F ; thing we wrote over, write small key count
-	LDA !LOCK_STATS : BNE +
-		JSL AddInventory_incrementKeyLong
-	+
-	JSL.l UpdateKeys
-	PHY : LDY.b #24 : JSL.l FullInventoryExternal : PLY
-	JSL.l HUD_RebuildLong
+	
+	PHX
+		LDA !LOCK_STATS : BNE +
+			JSL AddInventory_incrementKeyLong
+		+
+		JSL.l UpdateKeys
+		PHY : LDY.b #24 : JSL.l FullInventoryExternal : PLY
+		JSL.l HUD_RebuildLong
+	PLX
 RTL
 ;--------------------------------------------------------------------------------
 DecrementSmallKeys:
diff --git a/swordswap.asm b/swordswap.asm
index 2953b45..38c12d1 100644
--- a/swordswap.asm
+++ b/swordswap.asm
@@ -68,23 +68,23 @@ RTL
 LoadModifiedMagicLevel:
 	LDA $7F50C3 : BEQ +
 		!ADD $7EF37B ; add normal magic value to modifier
-			CMP.b #$FF : BNE + : LDA.b #$00 : +
-			CMP.b #$03 : !BLT ++ : LDA.b #$02 : RTS : ++
+			CMP.b #$FF : BNE ++ : LDA.b #$00 : RTL : ++
+			CMP.b #$03 : !BLT ++ : LDA.b #$02 : ++
 		RTL
 	+
-	LDA $7F50C3 ; load normal magic value
+	LDA $7EF37B ; load normal magic value
 RTL
 ;================================================================================
 ; $7E0348 - Ice Value
 ; $7F50C7 - Ice Modifier
 LoadModifiedIceFloorValue_a11:
-	LDA $5D : CMP #$01 : BEQ +
+	LDA $5D : CMP #$01 : BEQ + : CMP #$17 : BEQ + : CMP #$1C : BEQ +
 	LDA $5B : BNE +
 		LDA.w $0348 : ORA $7F50C7 : AND.b #$11 : RTL
 	+ : LDA.w $0348 : AND.b #$11
 RTL
 LoadModifiedIceFloorValue_a01:
-	LDA $5D : CMP #$01 : BEQ +
+	LDA $5D : CMP #$01 : BEQ + : CMP #$17 : BEQ + : CMP #$1C : BEQ +
 	LDA $5B : BNE +
 		LDA.w $0348 : ORA $7F50C7 : AND.b #$01 : RTL
 	+ : LDA.w $0348 : AND.b #$01