diff --git a/Debug/debug.asm b/Debug/debug.asm
index 05b190b..758dba9 100644
--- a/Debug/debug.asm
+++ b/Debug/debug.asm
@@ -26,68 +26,96 @@ namespace Debug
 
     LDA #$03    ; 0 - nothing. 1 - bow w/ no arrows. 2 - bow w/ arrows. 3 - silver arrows
     STA $7EF340
+
     LDA #$02    ; 0 - nothing. 1 - blue boomerang. 2 - red boomerang
     STA $7EF341
-    LDA #$01    ; 0 - nothing. 1 - hookshot.
+
+    LDA #$00    ; 0 - nothing. 1 - hookshot.
     STA $7EF342
+
     LDA #$32    ; How many bombs you have. Can exceed 0x50, up to 0xff.
     STA $7EF343
+
     LDA #$02    ; 0 - nothing. 1 - Mushroom. 2 - Magic Powder
     STA $7EF344
+
     LDA #$01    ; 0 - nothing. 1 - Fire Rod
     STA $7EF345
+
     LDA #$01    ; 0 - nothing. 1 - Ice Rod
     STA $7EF346
+
     LDA #$01    ; 0 - nothing. 1 - Bombos Medallion
     STA $7EF347
-    LDA #$01    ; 0 - nothing. 1 - Ether Medallion
+
+    LDA #$01    ; 0 - nothing. 1 - Ether Medallion (Deku Mask)
     STA $7EF348
-    LDA #$01    ; 0 - nothing. 1 - Quake Medallion
+
+    LDA #$01    ; 0 - nothing. 1 - Quake Medallion (Zora Mask)
     STA $7EF349
+
     LDA #$01    ; 0 - nothing. 1 - Torch
     STA $7EF34A
+
     LDA #$01    ; 0 - nothing. 1 - Magic Hammer
     STA $7EF34B
+
     LDA #$03    ; 0 - nothing. 1 - shovel. 2 - flute, no bird. 3 - flue, bird activated
     STA $7EF34C
+
     LDA #$01    ; 0 - nothing. 1 - bug catching net
     STA $7EF34D
+
     LDA #$01    ; 0 - nothing. 1 - Book of Mudora
     STA $7EF34E
+
     LDA #$01    ; 0 - nothing. 1 - has bottles.
     STA $7EF34F
+    
     LDA #$01    ; 0 - nothing. 1 - cane of somaria.
     STA $7EF350
-    LDA #$01    ; 0 - nothing. 1 - cane of byrna.
+
+    LDA #$00    ; 0 - nothing. 1 - cane of byrna.
     STA $7EF351
+
     LDA #$01    ; 0 - nothing. 1 - magic cape.
     STA $7EF352
+
     LDA #$02    ; 0 - nothing. 1 - scroll looking thing that works like mirror. 2 - mirror with correct graphic.
     STA $7EF353
-    LDA #$00    ; 0 - normal strength. 1 - Power Gloves. 2 - Titan's Mitt
+
+    LDA #$02    ; 0 - normal strength. 1 - Power Gloves. 2 - Titan's Mitt
     STA $7EF354
-    LDA #$01    ; 0 - nothing. 1 - pegasus boots. 
-                ; *Just having the boots isn't enough to dash. You must have the ability flag corresponding to run set as well. See $379.
+
+    LDA #$00    ; 0 - nothing. 1 - pegasus boots. 
+                ; *Just having the boots isn't enough to dash. 
+                ; You must have the ability flag corresponding to run set as well. See $379.
+
     STA $7EF355
-    LDA #$01    ; 0 - nothing. 1 - flippers. Having this allows you to swim, but doesn't make the swim ability text show up by itself. See $379. Unlike the boots, the ability is granted, as long as you have this item.
+    LDA #$01    ; 0 - nothing. 1 - flippers. 
+                ; Having this allows you to swim, but doesn't make the swim ability text show up by itself. 
+                ; See $379. Unlike the boots, the ability is granted, as long as you have this item.
+
     STA $7EF356
     LDA #$01    ; 0 - nothing. 1 - moon pearl.
     STA $7EF357
     LDA #$01 
-    STA $7EF358 ; 0 -nothing. 1 - wolf mask 
+    STA $7EF358 ; 0 - nothing. 1 - wolf mask 
+
     LDA #$01    ; 0-No sword. 1-Fighter Sword. 2-Master Sword. 3-Tempered Sword. 4-Golden Sword
     STA $7EF359
-    LDA #$01    ; 0-No shield. 1-Blue Shield. 2-Hero's Shield. 3-Mirror Shield  
+    LDA #$03    ; 0-No shield. 1-Blue Shield. 2-Hero's Shield. 3-Mirror Shield  
     STA $7EF35A
     LDA #$00    ; 0-Green Jerkin. 1-Blue Mail. 2-Red Mail
     STA $7EF35B
-    LDA #$03    ; 0-No bottle. 1-Mushroom (no use). 2-Empty bottle. 3-Red Potion. 4-Green Potion. 5-Blue Potion. 6-Fairy. 7-Bee. 8-Good Bee
+    LDA #$03    ; 0-No bottle. 1-Mushroom (no use). 2-Empty bottle. 3-Red Potion. 4-Green Potion. 
+                ; 5-Blue Potion. 6-Fairy. 7-Bee. 8-Good Bee
     STA $7EF35C
-    LDA #$08    ; second bottle
+    LDA #$00    ; second bottle
     STA $7EF35D
-    LDA #$05    ; third bottle
+    LDA #$00    ; third bottle
     STA $7EF35E
-    LDA #$06    ; fourth bottle
+    LDA #$00    ; fourth bottle
     STA $7EF35F
     LDA #$E7    ; 2 bytes for rupees (goal, for counting up)
     STA $7EF360
@@ -96,20 +124,31 @@ namespace Debug
 
     ; a few bytes for dungeon items like compasses, maps and big keys are here, we jump over that
 
-    LDA #$A0    ; health capacity (maximum number of hearts)
+    LDA #$50    ; health capacity (maximum number of hearts)
     STA $7EF36C
     LDA #$80    ; magic power, maximum is 0x80
     STA $7EF36E
     LDA #$A0    ; Fill all hearts
     STA $7EF372
-    LDA #$07    ; Pendants: Bit 0 = Courage, Bit 1 = Wisdom, Bit 2 = Power
+
+    LDA #$00    ; Pendants: Bit 0 = Courage, Bit 1 = Wisdom, Bit 2 = Power
     STA $7EF374
+
     LDA #$32    ; How many arrows you have. Can exceed 0x70.
     STA $7EF377
-    LDA #$6E    ; Ability Flags: Bit 0: ----. Bit 1: Swim. Bit 2: Run / Dash. Bit 3: Pull. Bit 4: ----. Bit 5: Talk. Bit 6: Read. Bit 7: ----
+
+    LDA #$6E    ; Ability Flags: Bit 0: ----. 
+                ; Bit 1: Swim.
+                ; Bit 2: Run / Dash.
+                ; Bit 3: Pull. Bit 4: ----. 
+                ; Bit 5: Talk. 
+                ; Bit 6: Read. Bit 7: ----
+
     STA $7EF379
-    LDA #$7F
+
+    LDA #$00
     STA $7EF37A ; Crystals: Bit 0 = Misery Mire, Bit 1 = Dark Palace, Bit 2 = Ice Palace, Bit 3 = Turtle Rock, Bit 4 = Swamp Palace, Bit 5 = Gargoyle's Domain, Bit 6 = Skull Woods
+
     LDA #$02    ; Magic usage: 0: normal consumption. 1: 1/2 consumption. 2: 1/4 consumption
     STA $7EF37B
 
diff --git a/Masks/deku_mask.asm b/Masks/deku_mask.asm
index 563411d..3d66f7d 100644
--- a/Masks/deku_mask.asm
+++ b/Masks/deku_mask.asm
@@ -281,74 +281,6 @@ LinkItem_UsingDekuMask:
 org $358000
 incbin gfx/deku_link.bin
 
-; =============================================================================
-
-org $1BEDF9
-JSL Palette_ArmorAndGloves ; 4bytes
-RTL ; 1byte 
-NOP #$01
-
-org $1BEE1B
-JSL Palette_ArmorAndGloves_part_two
-RTL
-
-; =============================================================================
-
-; Code : 
-org $398000
-Palette_ArmorAndGloves:
-{
-  LDA.b #$10 
-  STA $BC         ; Load Original Sprite Location
-  REP #$21
-  LDA $7EF35B
-  JSL $1BEDFF     ; Read Original Palette Code
-  RTL
-.part_two
-  SEP #$30
-      REP #$30
-      LDA $7EF354
-      JSL $1BEE21 ; Read Original Palette Code
-  RTL
-
-  PHX : PHY : PHA
-  ; Load armor palette
-  PHB : PHK : PLB
-
-  REP #$20
-  
-  ; Check what Link's armor value is.
-  LDA $7EF35B : AND.w #$00FF : TAX
-  
-  LDA $1BEC06, X : AND.w #$00FF : ASL A : ADC.w #$F000 : STA $00
-  REP #$10
-  
-  LDA.w #$01E2 ; Target SP-7 (sprite palette 6)
-  LDX.w #$000E ; Palette has 15 colors
-  
-  TXY : TAX
-  
-  LDA.b $BC : AND #$00FF : STA $02
-
-.loop
-
-  LDA [$00] : STA $7EC300, X : STA $7EC500, X
-  
-  INC $00 : INC $00
-  
-  INX #2
-  
-  DEY : BPL .loop
-
-  SEP #$30
-  
-  
-  PLB
-  INC $15
-  PLA : PLY : PLX
-  RTL
-}
-
 ; org $07A666
 ; Deku_Entry:
 ; {
diff --git a/Masks/link_handler.asm b/Masks/link_handler.asm
index b5cae85..e52e0b5 100644
--- a/Masks/link_handler.asm
+++ b/Masks/link_handler.asm
@@ -10,28 +10,6 @@
   
 ;   fill $763
 ; }
-
-
-
-org $07983A
-  Player_ResetSwimState:
-
-org $079873
-  Player_ResetSwimCollision:
-
-org $0ED6C0
-  LoadActualGearPalettes:
-
-org $07E245 
-  Link_HandleVelocity:
-
-org $07915E
-  LinkState_ExitingDash:
-
-org $07E6A6
-  Link_HandleMovingAnimation_FullLongEntry:
-
-
 ; ==============================================================================
 
 ; *$3D798-$3D7D7 LOCAL