diff --git a/ootw/ending.s b/ootw/ending.s
index 4b34e8fb..5529ed3e 100644
--- a/ootw/ending.s
+++ b/ootw/ending.s
@@ -216,5 +216,5 @@ PT3_LOC = song
 ; must be page aligned
 .align 256
 song:
-.incbin "ootw_audio/ootw_intro.pt3"
+.incbin "ootw_audio/ootw_outro.pt3"
 
diff --git a/ootw/interrupt_handler.s b/ootw/interrupt_handler.s
index e836df2d..6b498e4b 100644
--- a/ootw/interrupt_handler.s
+++ b/ootw/interrupt_handler.s
@@ -18,6 +18,7 @@
 	;	to be sure status flag and accumulator set properly
 
 interrupt_handler:
+
 	php			; save status flags
 	pha			; save A				; 3
 				; A is saved in $45 by firmware
diff --git a/ootw/ootw_audio/NOTES b/ootw/ootw_audio/NOTES.sample
similarity index 100%
rename from ootw/ootw_audio/NOTES
rename to ootw/ootw_audio/NOTES.sample
diff --git a/ootw/ootw_audio/ootw_outro.pt3 b/ootw/ootw_audio/ootw_outro.pt3
new file mode 100644
index 00000000..d883a0e9
Binary files /dev/null and b/ootw/ootw_audio/ootw_outro.pt3 differ
diff --git a/ootw/ootw_graphics/l16end/ootw_c16_end.inc b/ootw/ootw_graphics/l16end/ootw_c16_end.inc
index 60963acc..98dec89b 100644
--- a/ootw/ootw_graphics/l16end/ootw_c16_end.inc
+++ b/ootw/ootw_graphics/l16end/ootw_c16_end.inc
@@ -68,7 +68,7 @@ rooftop_rle:	.byte $28 ; ysize=48
 	.byte $A0,$11,$AA, $00, $A0,$12,$AA, $00,$00, $0A, $AF,$AA, $0A
 	.byte $A3,$00, $70, $50,$50, $F0, $C0,$C0, $CB, $0B
 	.byte $00, $B9, $99, $A0,$12,$00, $0A, $A4,$AA, $0A
-	.byte $AE,$00, $A0,$16,$70, $7A, $A0,$02,$AA, $A0,$01,$A0, $A0,$24,$00, $A0,$01,$A0
+	.byte $AE,$00, $A0,$16,$50, $5A, $A0,$02,$AA, $A0,$01,$A0, $A0,$24,$00, $A0,$01,$A0
 	.byte $A3,$AA, $A0,$01,$A0, $A0,$22,$00, $A6,$AA, $A0,$22,$00, $A6,$AA, $A0,$22,$00
 	.byte $A3,$AA
 	.byte $A1
diff --git a/ootw/ootw_graphics/l16end/rooftop.png b/ootw/ootw_graphics/l16end/rooftop.png
index 6667938c..bd8f9d88 100644
Binary files a/ootw/ootw_graphics/l16end/rooftop.png and b/ootw/ootw_graphics/l16end/rooftop.png differ
diff --git a/ootw/pt3_lib.s b/ootw/pt3_lib.s
index f9185dd8..317fd8d5 100644
--- a/ootw/pt3_lib.s
+++ b/ootw/pt3_lib.s
@@ -295,7 +295,7 @@ load_ornament0:
 
 load_ornament:
 
-	sty	TEMP		; save Y value				; 3
+	sty	PT3_TEMP		; save Y value			; 3
 
 	;pt3->ornament_patterns[i]=
         ;               (pt3->data[0xaa+(i*2)]<<8)|pt3->data[0xa9+(i*2)];
@@ -340,7 +340,7 @@ load_ornament:
 	adc	#$0							; 2
 	sta	note_a+NOTE_ORNAMENT_POINTER_H,X			; 5
 
-	ldy	TEMP		; restore Y value			; 3
+	ldy	PT3_TEMP		; restore Y value		; 3
 
 	rts								; 6
 
@@ -369,7 +369,7 @@ load_sample1:
 
 load_sample:
 
-	sty	TEMP							; 3
+	sty	PT3_TEMP						; 3
 
 	;pt3->ornament_patterns[i]=
         ;               (pt3->data[0x6a+(i*2)]<<8)|pt3->data[0x69+(i*2)];
@@ -412,7 +412,7 @@ load_sample:
 	adc	#$0							; 2
 	sta	note_a+NOTE_SAMPLE_POINTER_H,X				; 5
 
-	ldy	TEMP							; 3
+	ldy	PT3_TEMP						; 3
 
 	rts								; 6
 								;============
@@ -2205,7 +2205,7 @@ done_do_frame:
 	; FIXME: self modify code
 GetNoteFreq:
 
-	sty	TEMP							; 3
+	sty	PT3_TEMP						; 3
 
 	tay								; 2
 	lda	PT3_LOC+PT3_HEADER_FREQUENCY				; 4
@@ -2217,7 +2217,7 @@ GetNoteFreq:
 	lda	PT3NoteTable_ST_low,Y					; 4+
 	sta	freq_l							; 4
 
-	ldy	TEMP							; 3
+	ldy	PT3_TEMP						; 3
 	rts								; 6
 								;===========
 								;	40
@@ -2229,7 +2229,7 @@ freq_table_2:
 	lda	PT3NoteTable_ASM_34_35_low,Y				; 4+
 	sta	freq_l							; 4
 
-	ldy	TEMP							; 3
+	ldy	PT3_TEMP						; 3
         rts								; 6
 								;===========
 								;	41
diff --git a/ootw/zp.inc b/ootw/zp.inc
index 584da1ed..d4752be3 100644
--- a/ootw/zp.inc
+++ b/ootw/zp.inc
@@ -88,7 +88,7 @@ MB_ADDRL        = $86
 MB_ADDRH        = $87
 DONE_PLAYING    = $88
 DONE_SONG       = $89
-
+PT3_TEMP	= $8A
 
 
 ; More zero-page addresses