diff --git a/th02_main.asm b/th02_main.asm
index f4d0dd2d..958e1e65 100644
--- a/th02_main.asm
+++ b/th02_main.asm
@@ -994,16 +994,7 @@ arg_4		= word ptr  8
 		enter	0Ah, 0
 		push	[bp+arg_4]
 		push	[bp+arg_2]
-		nop
-		push	cs
-sub_4314	endp ; sp-analysis failed
-
-
-; =============== S U B	R O U T	I N E =======================================
-
-
-sub_4320	proc far
-		call	near ptr file_ropen
+		nopcall	file_ropen
 		push	ss
 		lea	ax, [bp-0Ah]
 		push	ax
@@ -1016,7 +1007,7 @@ sub_4320	proc far
 		nopcall	file_close
 		leave
 		retf	4
-sub_4320	endp
+sub_4314	endp
 
 
 ; =============== S U B	R O U T	I N E =======================================
@@ -2544,7 +2535,7 @@ loc_B922:
 		pop	si
 		leave
 		retn
-sub_B3DA	endp ; sp-analysis failed
+sub_B3DA	endp
 
 ; ---------------------------------------------------------------------------
 off_B982	dw offset loc_B63C
diff --git a/th03_zunsp.asm b/th03_zunsp.asm
index 7b16e358..d8a06276 100644
--- a/th03_zunsp.asm
+++ b/th03_zunsp.asm
@@ -38,8 +38,6 @@ aSprite16	db 'SPRITE16',0
 
 sub_10C		proc near
 
-; FUNCTION CHUNK AT 0191 SIZE 0000000B BYTES
-
 		cld
 		push	offset aZunsp_comVersi ; "ZUNSP.COM    Version 1.00 Copyright(C) "...
 		call	sub_676
@@ -108,10 +106,7 @@ loc_186:
 		call	sub_676
 		mov	ax, 4C01h
 		int	21h		; DOS -	2+ - QUIT WITH EXIT CODE (EXIT)
-sub_10C		endp			; AL = exit code
-
-; ---------------------------------------------------------------------------
-; START	OF FUNCTION CHUNK FOR sub_10C
+					; AL = exit code
 
 loc_191:
 		cmp	cs:word_F40, 0
@@ -120,7 +115,7 @@ loc_191:
 
 locret_19B:
 		retn
-; END OF FUNCTION CHUNK	FOR sub_10C
+sub_10C		endp
 
 ; =============== S U B	R O U T	I N E =======================================
 
diff --git a/th04_main.asm b/th04_main.asm
index 3ab95a2c..c635fbbf 100644
--- a/th04_main.asm
+++ b/th04_main.asm
@@ -4028,8 +4028,6 @@ loc_C6A1:
 		idiv	bx
 		add	ax, 10h
 		mov	[si+4],	ax
-
-loc_C6C8:
 		mov	word ptr [si+6], 84h
 		mov	word ptr [si+8], 0FFF8h
 		jmp	short loc_C6DD
@@ -4047,7 +4045,7 @@ loc_C6DD:
 		pop	si
 		pop	bp
 		retf	4
-sub_C696	endp ; sp-analysis failed
+sub_C696	endp
 
 
 ; =============== S U B	R O U T	I N E =======================================
@@ -16784,7 +16782,7 @@ loc_1286D:
 		pop	si
 		leave
 		retn
-sub_12461	endp ; sp-analysis failed
+sub_12461	endp
 
 ; ---------------------------------------------------------------------------
 		db 0
@@ -18552,7 +18550,7 @@ loc_13712:
 		pop	si
 		pop	bp
 		retf	6
-sub_136B4	endp ; sp-analysis failed
+sub_136B4	endp
 
 ; ---------------------------------------------------------------------------
 		nop
@@ -19076,8 +19074,6 @@ sub_13B21	proc near
 		push	si
 		mov	si, 9292h
 		xor	cx, cx
-sub_13B21	endp ; sp-analysis failed
-
 		jmp	short loc_13B81
 ; ---------------------------------------------------------------------------
 
@@ -19124,6 +19120,7 @@ loc_13B86:
 		pop	si
 		pop	bp
 		retn
+sub_13B21	endp
 
 ; =============== S U B	R O U T	I N E =======================================
 
@@ -26449,10 +26446,6 @@ loc_1795F:
 		call	sub_1CFA2
 		call	snd_se_play pascal, 15
 		jmp	short loc_179B8
-sub_1788E	endp
-
-; ---------------------------------------------------------------------------
-; START	OF FUNCTION CHUNK FOR sub_1CCB8
 
 loc_179A8:
 		mov	word_2671A, 0
@@ -26464,7 +26457,7 @@ loc_179B8:
 		pop	si
 		leave
 		retn
-; END OF FUNCTION CHUNK	FOR sub_1CCB8
+sub_1788E	endp
 
 ; =============== S U B	R O U T	I N E =======================================
 
@@ -26806,7 +26799,7 @@ loc_17CA4:
 		call	sub_19F16
 		leave
 		retf
-sub_179F4	endp ; sp-analysis failed
+sub_179F4	endp
 
 ; ---------------------------------------------------------------------------
 word_17CBF	dw	0,     1,     2,     3
@@ -28980,12 +28973,7 @@ sub_18DB6	endp
 sub_18E43	proc near
 		push	bp
 		mov	bp, sp
-sub_18E43	endp ; sp-analysis failed
-
-; START	OF FUNCTION CHUNK FOR sub_1CD6E
-
-loc_18E46:
-		cmp	word_2671A, 10h	; jumptable 0001CD8F case 17022
+		cmp	word_2671A, 10h
 		jnz	short loc_18E54
 		mov	byte_26718, 8
 		pop	bp
@@ -29054,7 +29042,7 @@ loc_18EB6:
 loc_18EE5:
 		pop	bp
 		retn
-; END OF FUNCTION CHUNK	FOR sub_1CD6E
+sub_18E43	endp
 
 ; =============== S U B	R O U T	I N E =======================================
 
@@ -35110,8 +35098,6 @@ sub_1C164	endp
 
 sub_1C1CF	proc near
 
-; FUNCTION CHUNK AT 87B5 SIZE 0000000C BYTES
-
 		push	bp
 		mov	bp, sp
 		call	sub_1BDB4
@@ -35134,14 +35120,10 @@ sub_1C1CF	proc near
 		add	word ptr dword_266E4, 400h
 		call	fp_2D000
 		call	sub_13D52
-sub_1C1CF	endp ; sp-analysis failed
-
-; START	OF FUNCTION CHUNK FOR sub_1EA4B
 
 loc_1C21B:
 		mov	byte_266ED, al
 		sub	word ptr dword_266E4, 200h
-; END OF FUNCTION CHUNK	FOR sub_1EA4B
 		sub	word ptr dword_266E4+2,	200h
 		call	fp_2D000
 		call	sub_13D52
@@ -35149,7 +35131,6 @@ loc_1C21B:
 		add	word ptr dword_266E4+2,	400h
 		call	fp_2D000
 		call	snd_se_play pascal, 9
-; START	OF FUNCTION CHUNK FOR sub_1C1CF
 
 loc_1C245:
 		cmp	word_2671A, 50h	; 'P'
@@ -35159,7 +35140,7 @@ loc_1C245:
 loc_1C24F:
 		pop	bp
 		retn
-; END OF FUNCTION CHUNK	FOR sub_1C1CF
+sub_1C1CF	endp
 
 ; =============== S U B	R O U T	I N E =======================================
 
@@ -40446,12 +40427,7 @@ var_1		= byte ptr -1
 		mov	byte_266E3, 39h	; '9'
 		mov	byte_266EE, 10h
 		mov	byte_266ED, 0
-sub_1EE73	endp ; sp-analysis failed
-
-; START	OF FUNCTION CHUNK FOR sub_1EA4B
-
-loc_1EED3:
-		mov	byte_266F2, 82h ; jumptable 0001EA6B case 65331
+		mov	byte_266F2, 82h
 		mov	byte_2CFF7, 1
 		mov	byte_266EC, 26h	; '&'
 		mov	byte_266EF, 10h
@@ -40514,7 +40490,7 @@ loc_1EF84:
 		pop	si
 		leave
 		retn
-; END OF FUNCTION CHUNK	FOR sub_1EA4B
+sub_1EE73	endp
 
 ; =============== S U B	R O U T	I N E =======================================
 
diff --git a/th04_maine.asm b/th04_maine.asm
index eaf03080..9ef85330 100644
--- a/th04_maine.asm
+++ b/th04_maine.asm
@@ -6242,7 +6242,7 @@ loc_D67A:
 		pop	di
 		pop	si
 		retf
-sub_D626	endp ; sp-analysis failed
+sub_D626	endp
 
 ; ---------------------------------------------------------------------------
 		push	si
diff --git a/th04_op.asm b/th04_op.asm
index c126bcba..d03d1c06 100644
--- a/th04_op.asm
+++ b/th04_op.asm
@@ -6837,7 +6837,7 @@ loc_E1D4:
 		pop	si
 		pop	bp
 		retf	6
-sub_E176	endp ; sp-analysis failed
+sub_E176	endp
 
 ; ---------------------------------------------------------------------------
 		nop
@@ -7136,7 +7136,7 @@ loc_E47C:
 		pop	di
 		pop	si
 		retf
-sub_E428	endp ; sp-analysis failed
+sub_E428	endp
 
 
 ; =============== S U B	R O U T	I N E =======================================
@@ -7169,7 +7169,7 @@ loc_E4B1:
 		pop	di
 		pop	si
 		retf
-sub_E490	endp ; sp-analysis failed
+sub_E490	endp
 
 ; ---------------------------------------------------------------------------
 		nop
diff --git a/th05_main.asm b/th05_main.asm
index a458358b..ec0bafe2 100644
--- a/th05_main.asm
+++ b/th05_main.asm
@@ -21243,7 +21243,7 @@ loc_14CDA:
 		pop	si
 		pop	bp
 		retf	6
-sub_14C7C	endp ; sp-analysis failed
+sub_14C7C	endp
 
 include th04/hardware/snd_se.asm
 
@@ -21336,7 +21336,7 @@ loc_14DEA:
 		pop	si
 		pop	bp
 		retf	6
-sub_14D74	endp ; sp-analysis failed
+sub_14D74	endp
 
 ; ---------------------------------------------------------------------------
 		nop
diff --git a/th05_maine.asm b/th05_maine.asm
index bbd5cd58..7ace7530 100644
--- a/th05_maine.asm
+++ b/th05_maine.asm
@@ -8714,7 +8714,7 @@ loc_EACC:
 		pop	si
 		pop	bp
 		retf	6
-sub_EA6E	endp ; sp-analysis failed
+sub_EA6E	endp
 
 ; ---------------------------------------------------------------------------
 		nop
@@ -8767,7 +8767,7 @@ loc_EBBA:
 		pop	di
 		pop	si
 		retf
-sub_EB66	endp ; sp-analysis failed
+sub_EB66	endp
 
 ; ---------------------------------------------------------------------------
 		push	si
@@ -8974,7 +8974,7 @@ loc_ED48:
 		pop	di
 		pop	bp
 		retf	8
-sub_ECDE	endp ; sp-analysis failed
+sub_ECDE	endp
 
 ; ---------------------------------------------------------------------------
 		nop
diff --git a/th05_op.asm b/th05_op.asm
index f9f9fb41..467a527d 100644
--- a/th05_op.asm
+++ b/th05_op.asm
@@ -6109,7 +6109,7 @@ loc_D5EE:
 		pop	si
 		pop	bp
 		retf	6
-sub_D590	endp ; sp-analysis failed
+sub_D590	endp
 
 include th04/hardware/snd_se.asm
 
@@ -6159,7 +6159,7 @@ loc_D6DC:
 		pop	di
 		pop	si
 		retf
-sub_D688	endp ; sp-analysis failed
+sub_D688	endp
 
 
 ; =============== S U B	R O U T	I N E =======================================
@@ -6192,7 +6192,7 @@ loc_D711:
 		pop	di
 		pop	si
 		retf
-sub_D6F0	endp ; sp-analysis failed
+sub_D6F0	endp
 
 ; ---------------------------------------------------------------------------
 		nop
@@ -6307,7 +6307,7 @@ loc_D7CE:
 		pop	si
 		pop	bp
 		retf	6
-sub_D758	endp ; sp-analysis failed
+sub_D758	endp
 
 ; ---------------------------------------------------------------------------
 		nop
@@ -6636,9 +6636,6 @@ sub_DA30	endp
 
 sub_DA6B	proc far
 
-; FUNCTION CHUNK AT 0180 SIZE 00000074 BYTES
-; FUNCTION CHUNK AT 021F SIZE 00000027 BYTES
-
 		cmp	al, 0FFh
 		jnz	short loc_DA70
 		retn
@@ -6698,7 +6695,7 @@ loc_DACE:
 		pop	di
 		pop	bx
 		retn
-sub_DA6B	endp ; sp-analysis failed
+sub_DA6B	endp
 
 ; ---------------------------------------------------------------------------
 off_DAD1	dw offset loc_DA9D
@@ -6851,7 +6848,7 @@ loc_DBA6:
 		pop	di
 		pop	bp
 		retf	8
-sub_DB3C	endp ; sp-analysis failed
+sub_DB3C	endp
 
 ; ---------------------------------------------------------------------------
 		nop