diff --git a/megademo/TODO b/megademo/TODO
index 47745746..aac8c31d 100644
--- a/megademo/TODO
+++ b/megademo/TODO
@@ -10,8 +10,6 @@ THANKS:
 
 Overall:
 	fix off-by-one line vaporlock
-	disk loader?
-	Load with HGR C64 at offset 0x2000 and then straight to 0x4000
 	Trim the last 8 bytes off of all the lz4 files
 
 Music:
@@ -24,10 +22,12 @@ Timing:
 0: c64_opener:
 	get curtain-opening effect working
 	add text to background
+	auto timeout to next screen
 
 1: falling_apple:
 	make it fall?
 	some sort of wipe?
+	auto timeout to next screen
 
 2: starring:
 	complete graphics
@@ -35,44 +35,46 @@ Timing:
 	add wipe effect with tengwar: just draw 4 bytes yellow, 4 bytes
 	from scroll buffer
 	Add Susie starring role?
+	auto timeout to next screen
 
 3: e-mail:
 	Update to proper text
 	Add susie?
+	auto timeout to next screen
 
 4: leave house:
-	Green, a house on left?  fence, bird?
-	have mountain in background?
+	Add some sort of text?
 	
 
 5: running bird:
 	run to middle of screen, then have everything start moving?
 	update text
+	auto timeout to next screen
 
 6: waterfall:
 	finish packing down a bit
+	auto movement
+	auto timeout to next screen
 
 7: arrival at ship
 	top HGR, bottom gr
 	close door
 	flames going
 	tree goes from big to small, horizon drops?
+	auto timeout to next screen
 
 8: mode7:
 	change path
 	change ground to night-time darkness.  grey water
+	detect keypress
 
 9: spacegame:
-	saturn-like planet?  raster bars?
-	score at top?
+	auto movement
+	auto timeout to next screen
 	when done, blue horiz line?
 
 10: arrive at frogysue:
-	park ship on left
-	amethys crystals?
-	sky text/ground lgr?
-	susie follow?
-	haert when meet at center?
+	add text?
 
 11: fireworks:
 	update text
diff --git a/megademo/arrival.s b/megademo/arrival.s
index a77ce1bb..f3f77a44 100644
--- a/megademo/arrival.s
+++ b/megademo/arrival.s
@@ -24,7 +24,7 @@ setup_arrival:
 	sta	FRAME
 	sta	FRAMEH
 
-	lda	#250
+	lda	#0
 	sta	TFV_X
 
 	lda	#8
@@ -105,10 +105,10 @@ arloopB:dex								; 2
 	; Total of 17030 cycles to get back to where was
 
 	; want 12*4 = 48 lines of TEXT = 3120-4=3116
-	; want 136-48 = 88 lines of undisturbed LORES = 5720 - 4 = 5716
-	; 	lores lines 20-33 (80 - 135) are changing
+	; want 144-48 = 96 lines of undisturbed LORES = 6240 - 4 = 6236
+	; 	lores lines 24-36 (80 - 143) are changing
 	;	so don't do much then
-	; want 192-136=56 lines of LORES = 3640
+	; want 192-144=48 lines of LORES = 3120
 
 
 
@@ -225,10 +225,12 @@ arloop9:dex								; 2
 
 	bit	SET_GR			; 4
 
-	; Try X=75 Y=15 cycles=5716
+	; Try X=53 Y=23 cycles=6234 R2
 
-	ldy	#15							; 2
-arloop6:ldx	#75							; 2
+	nop
+
+	ldy	#23							; 2
+arloop6:ldx	#53							; 2
 arloop7:dex								; 2
 	bne	arloop7							; 2nt/3
 	dey								; 2
@@ -270,18 +272,22 @@ ar_back_from_jumptable:
 	; We have 4550 cycles in the vblank, use them wisely
 	;======================================================
 
-	; do_nothing should be      3640 (bottom of GR screen)
+	; do_nothing should be      3120 (bottom of GR screen)
 	;			    4550 (vblank)
 	;			     -23 (setup jump table)
 	;			   -6237 (in state code)
 	;			     -10 keypress
 	;			===========
-	;			     1920
+	;			     1400
 
-	; Try X=19 Y=19 cycles=1920
+	; Try X=5 Y=45 cycles=1396 R4
 
-	ldy	#19							; 2
-arloop1:ldx	#19							; 2
+
+	nop
+	nop
+
+	ldy	#45							; 2
+arloop1:ldx	#5							; 2
 arloop2:dex								; 2
 	bne	arloop2							; 2nt/3
 	dey								; 2