diff --git a/hooks.asm b/hooks.asm
index 7e4dc2b..266b7ab 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -1834,7 +1834,7 @@ LDA CrystalPendantFlags_2, X
 ;JSL.l OverworldMap_CheckObject : RTS
 ;================================================================================
 org $0AC53e ; <- 5453E - Bank0A.asm:1771 - (LDA $0AC50D, X : STA $0D)
-LDA.l CrystalNumberTable, X
+LDA.l CrystalNumberTable-1, X
 ;================================================================================
 ; EVERY INSTANCE OF STA $7EF3C7 IN THE ENTIRE CODEBASE
 org $029D51 ; <- 11D51
diff --git a/menu/overworldmap.asm b/menu/overworldmap.asm
index b937655..d8f900d 100644
--- a/menu/overworldmap.asm
+++ b/menu/overworldmap.asm
@@ -159,6 +159,7 @@ LDX.b #$FF
 	LDA.l WorldMapIcon_posy_located+1, X : STA.l $7EC109
 	LDA.l WorldMapIcon_posy_located, X : STA.l $7EC108
     .adjustment
+    LDA.l WorldMapIcon_tile, X : CMP #$FF : BEQ .skip_draw
    	LDA.l WorldMapIcon_tile+1, X : BEQ .dont_adjust
    	CMP.b #$64 : BEQ .is_crystal
    	LDA.b $1A : AND.b #$10 : BNE .skip_draw
@@ -180,7 +181,7 @@ LDX.b #$FF
     .continue
     STA.b $0B
     PLX : PHX
-    JSR WorldMap_HandleSpriteBlink
+    INX : JSR WorldMap_HandleSpriteBlink
     .skip_draw
 	; end of loop
 	PLX : CPX #12 : BCS + : JMP .loopStart : +
@@ -253,10 +254,10 @@ RTS
 ; SEC - yep indicator can move
 OverworldMap_CheckForCompass:
 	LDA.l CompassMode : AND #$80 : BEQ .unset ; should I check for compass logic
-	LDA.l CompassMode : AND #$40 : BEQ .set ; compasses aren't shuffled
+	LDA.l CompassMode : AND #$40 : BEQ .set ; compasses/maps aren't shuffled
 	LDA.l CompassMode : AND #$20 : BNE +
 		JSR OverworldMap_CheckForMap : BCC .unset : BRA .set
-	+ LDA.l CompassExists, X : BEQ .set ; compass doesn't exits
+	+ LDA.l CompassExists, X : BEQ .set ; compass doesn't exist
 	PHX
 		LDA.l MC_SRAM_Offsets, X : TAX ; put compass offset into X
 		LDA !INVENTORY_COMPASS, X : ORA !MAP_OVERLAY, X