diff --git a/hooks.asm b/hooks.asm
index 7c33c18..c4a45b2 100644
--- a/hooks.asm
+++ b/hooks.asm
@@ -59,10 +59,8 @@ org $00FFEA : dw NMIBounce
 org $00FFEE : dw IRQBounce
 
 org $8098AB
-
-NMIBounce: JML $8080C9
-IRQBounce: JML $8082D8
-
+NMIBounce: JML.l $8080C9
+IRQBounce: JML.l $8082D8
 warnpc $8098C0
 
 ;================================================================================
diff --git a/init.asm b/init.asm
index bada0c8..fee19f9 100644
--- a/init.asm
+++ b/init.asm
@@ -49,10 +49,11 @@ Init_Primary:
 	SEP #$30
 
 	LDA.l RomSpeed : STA.w MEMSEL ; enable fastrom access on upper banks
-	STA.l OneMindId
+	LDA.b #$01 : STA.l OneMindId
 	
 	LDA.b #$10 : STA.b PlayerSpriteBank ; set default player sprite bank
 	LDA.b #$81 : STA.w NMITIMEN ; thing we wrote over, turn on NMI & gamepad
+        LDA.b #(ReturnFromInit>>16)|$80 : PHA : PLB
 
 JML ReturnFromInit
 
diff --git a/tables.asm b/tables.asm
index 2b27a87..a7dfdd4 100644
--- a/tables.asm
+++ b/tables.asm
@@ -2601,7 +2601,7 @@ dw #$0800          ; Yellow
 
 org $B0F032 ; PC 0x187032
 RomSpeed:
-db $01      ; $01 = FastROM (default | $00 = SlowROM)
+db $01      ; $01 = FastROM (default) | $00 = SlowROM
 
 org $B0F033 ; PC 0x187033
 
diff --git a/vanillalabels.asm b/vanillalabels.asm
index 9943358..295e813 100644
--- a/vanillalabels.asm
+++ b/vanillalabels.asm
@@ -164,6 +164,8 @@ RenderText_DecompressAndDrawSingle                         = $8EF4FB
 DecompressFontGFX                                          = $8EF572
 CopyDecompressedCharToTransferBuffer                       = $8EF5BC
 CopyDecompressedToFullBuffer                               = $8EF6A8
+Trinexx_FinalPhase                                         = $9DADB5
+Trinexx_PreFinalPhase                                      = $9DB0D2
 
 ;===================================================================================================
 ; Palettes