diff --git a/win9x/dclockd.x86 b/win9x/dclockd.x86
index 4eccd8d..3d87161 100644
--- a/win9x/dclockd.x86
+++ b/win9x/dclockd.x86
@@ -12,7 +12,6 @@ DCLOCK_PATMAX	equ		13
 .drawing		resw	1
 .clk_x			resb	1
 .pad			resb	1
-.dat
 				endstruc
 
 				struc dclockpos_t
@@ -173,7 +172,7 @@ _dclock_out8:	push	ebx
 				push	ebp
 				mov		ecx, [esp+16+4]
 				sub		dword [esp+16+8], byte DCLOCK_X
-				mov		esi, _dclock + dclock_t.dat
+				mov		esi, _dclock + dclock_t_size
 				mov		edi, _dclockpal + dclockpal_t.pal8
 				mov		bh, 4
 do8_lp1:		mov		bl, 3
@@ -207,7 +206,7 @@ _dclock_out16:	push	ebx
 				push	esi
 				push	edi
 				push	ebp
-				mov		esi, _dclock + dclock_t.dat
+				mov		esi, _dclock + dclock_t_size
 				mov		edi, _dclockpal + dclockpal_t.pal16
 				mov		ecx, [esp+16+4]
 				sub		dword [esp+16+8], byte (DCLOCK_X * 2)
@@ -238,5 +237,3 @@ do16_lp4:		rcl		bl, 1
 				pop		ebx
 				ret
 
-	ends
-
diff --git a/win9x/x86/opmgeng.x86 b/win9x/x86/opmgeng.x86
index 5724b17..6ad4bad 100644
--- a/win9x/x86/opmgeng.x86
+++ b/win9x/x86/opmgeng.x86
@@ -54,11 +54,10 @@ EM_OFF			equ		0
 .env_inc_decay1	resd	1		; 3c
 .env_inc_decay2	resd	1		; 40
 .env_inc_rel	resd	1		; 44
-.size
 				endstruc
 
 				struc	ch_t
-.slot			resb	(slot_t.size * 4)
+.slot			resb	(slot_t_size * 4)
 .algorithm		resb	1
 .feedback		resb	1
 .playing		resb	1
@@ -74,7 +73,6 @@ EM_OFF			equ		0
 .kcode			resb	1
 .pan			resb	1
 				resb	1
-.size
 				endstruc
 
 				struc opmgen_t
@@ -237,21 +235,21 @@ og_algchk:		cmp		byte [esi + ch_t.algorithm], 5
 				jmp		short og_calcslot3
 og_calcalg5:	mov		ebx, [esi + ch_t.connect1]	; case ALG != 5
 				add		[ebx], eax
-og_calcslot3:	add		edi, byte slot_t.size		; slot3 calculate
+og_calcslot3:	add		edi, byte slot_t_size		; slot3 calculate
 				calcenv	envcalc2, envret2
 				jl		short og_calcslot2
 				mov		eax, [_opmgen + opmgen_t.feedback2]
 				op_out
 				mov		ebx, [esi + ch_t.connect2]
 				add		[ebx], eax
-og_calcslot2:	add		edi, byte slot_t.size		; slot2 calculate
+og_calcslot2:	add		edi, byte slot_t_size		; slot2 calculate
 				calcenv	envcalc3, envret3
 				jl		short og_calcslot4
 				mov		eax, [_opmgen + opmgen_t.feedback3]
 				op_out
 				mov		ebx, [esi + ch_t.connect3]
 				add		[ebx], eax
-og_calcslot4:	add		edi, byte slot_t.size		; slot4 calculate
+og_calcslot4:	add		edi, byte slot_t_size		; slot4 calculate
 				calcenv	envcalc4, envret4
 				jl		short og_calcsloted
 				mov		eax, [_opmgen + opmgen_t.feedback4]
@@ -259,7 +257,7 @@ og_calcslot4:	add		edi, byte slot_t.size		; slot4 calculate
 				mov		ebx, [esi + ch_t.connect4]
 				add		[ebx], eax
 og_calcsloted:	inc		dword [_opmgen + opmgen_t.playing]
-og_calcch_nt:	add		esi, ch_t.size
+og_calcch_nt:	add		esi, ch_t_size
 				dec		ch
 				jne		near og_calcch_lp
 				mov		eax, [_opmgen + opmgen_t.outdc]
@@ -310,5 +308,3 @@ og_noupdate:	ret		4
 				setenv	envcalc3, envret3, 4
 				setenv	envcalc4, envret4, 8
 
-	ends
-
diff --git a/win9x/xmil.dsp b/win9x/xmil.dsp
index 545d3a4..a262238 100644
--- a/win9x/xmil.dsp
+++ b/win9x/xmil.dsp
@@ -193,7 +193,7 @@ InputPath=..\Z80X\Z80X_CB.X86
 InputName=Z80X_CB
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -205,7 +205,7 @@ InputPath=..\Z80X\Z80X_CB.X86
 InputName=Z80X_CB
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -217,7 +217,7 @@ InputPath=..\Z80X\Z80X_CB.X86
 InputName=Z80X_CB
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -229,7 +229,7 @@ InputPath=..\Z80X\Z80X_CB.X86
 InputName=Z80X_CB
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -248,7 +248,7 @@ InputPath=..\Z80X\Z80X_IF.X86
 InputName=Z80X_IF
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -260,7 +260,7 @@ InputPath=..\Z80X\Z80X_IF.X86
 InputName=Z80X_IF
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -272,7 +272,7 @@ InputPath=..\Z80X\Z80X_IF.X86
 InputName=Z80X_IF
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -284,7 +284,7 @@ InputPath=..\Z80X\Z80X_IF.X86
 InputName=Z80X_IF
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -303,7 +303,7 @@ InputPath=..\Z80X\Z80X_IX.X86
 InputName=Z80X_IX
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -315,7 +315,7 @@ InputPath=..\Z80X\Z80X_IX.X86
 InputName=Z80X_IX
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -327,7 +327,7 @@ InputPath=..\Z80X\Z80X_IX.X86
 InputName=Z80X_IX
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -339,7 +339,7 @@ InputPath=..\Z80X\Z80X_IX.X86
 InputName=Z80X_IX
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -358,7 +358,7 @@ InputPath=..\Z80X\Z80X_IY.X86
 InputName=Z80X_IY
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -370,7 +370,7 @@ InputPath=..\Z80X\Z80X_IY.X86
 InputName=Z80X_IY
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -382,7 +382,7 @@ InputPath=..\Z80X\Z80X_IY.X86
 InputName=Z80X_IY
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -394,7 +394,7 @@ InputPath=..\Z80X\Z80X_IY.X86
 InputName=Z80X_IY
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -413,7 +413,7 @@ InputPath=..\Z80X\Z80X_MN.X86
 InputName=Z80X_MN
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -425,7 +425,7 @@ InputPath=..\Z80X\Z80X_MN.X86
 InputName=Z80X_MN
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -437,7 +437,7 @@ InputPath=..\Z80X\Z80X_MN.X86
 InputName=Z80X_MN
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -449,7 +449,7 @@ InputPath=..\Z80X\Z80X_MN.X86
 InputName=Z80X_MN
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -468,7 +468,7 @@ InputPath=..\Z80X\Z80X_SB.X86
 InputName=Z80X_SB
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -480,7 +480,7 @@ InputPath=..\Z80X\Z80X_SB.X86
 InputName=Z80X_SB
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -492,7 +492,7 @@ InputPath=..\Z80X\Z80X_SB.X86
 InputName=Z80X_SB
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -504,7 +504,7 @@ InputPath=..\Z80X\Z80X_SB.X86
 InputName=Z80X_SB
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -523,7 +523,7 @@ InputPath=..\Z80X\Z80XMEM.X86
 InputName=Z80XMEM
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -535,7 +535,7 @@ InputPath=..\Z80X\Z80XMEM.X86
 InputName=Z80XMEM
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -547,7 +547,7 @@ InputPath=..\Z80X\Z80XMEM.X86
 InputName=Z80XMEM
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -559,7 +559,7 @@ InputPath=..\Z80X\Z80XMEM.X86
 InputName=Z80XMEM
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -710,7 +710,7 @@ InputPath=.\x86\OPMGENG.X86
 InputName=OPMGENG
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -722,7 +722,7 @@ InputPath=.\x86\OPMGENG.X86
 InputName=OPMGENG
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -734,7 +734,7 @@ InputPath=.\x86\OPMGENG.X86
 InputName=OPMGENG
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -746,7 +746,7 @@ InputPath=.\x86\OPMGENG.X86
 InputName=OPMGENG
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -877,7 +877,7 @@ InputPath=.\DCLOCKD.X86
 InputName=DCLOCKD
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -889,7 +889,7 @@ InputPath=.\DCLOCKD.X86
 InputName=DCLOCKD
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -901,7 +901,7 @@ InputPath=.\DCLOCKD.X86
 InputName=DCLOCKD
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
@@ -913,7 +913,7 @@ InputPath=.\DCLOCKD.X86
 InputName=DCLOCKD
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasmw -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
+	nasm -f win32 $(InputPath) -o $(IntDir)\$(InputName).obj
 
 # End Custom Build
 
diff --git a/z80x/z80x_cb.x86 b/z80x/z80x_cb.x86
index e5c2ecb..ff5dbe6 100644
--- a/z80x/z80x_cb.x86
+++ b/z80x/z80x_cb.x86
@@ -161,5 +161,3 @@ iycb_proc:		GETPCAX
 				push	dword cb_memory
 				jmp		lea_ecx_ecx
 
-	ends
-
diff --git a/z80x/z80x_if.x86 b/z80x/z80x_if.x86
index 54293cb..804b622 100644
--- a/z80x/z80x_if.x86
+++ b/z80x/z80x_if.x86
@@ -143,5 +143,3 @@ _z80x_step:		push	ebx
 				pop		ebx
 				jmp		_z80dmap
 
-	ends
-
diff --git a/z80x/z80x_ix.x86 b/z80x/z80x_ix.x86
index 460da48..766d22d 100644
--- a/z80x/z80x_ix.x86
+++ b/z80x/z80x_ix.x86
@@ -350,5 +350,3 @@ opcode_dd	dd	no_op,		no_op,		no_op,		no_op			; 00
 			dd	no_op,		ld_sp_ix,	no_op,		no_op
 			dd	no_op,		no_op,		no_op,		no_op
 
-	ends
-
diff --git a/z80x/z80x_iy.x86 b/z80x/z80x_iy.x86
index 2ae9407..84d9927 100644
--- a/z80x/z80x_iy.x86
+++ b/z80x/z80x_iy.x86
@@ -350,5 +350,3 @@ opcode_fd	dd	no_op,		no_op,		no_op,		no_op			; 00
 			dd	no_op,		ld_sp_iy,	no_op,		no_op
 			dd	no_op,		no_op,		no_op,		no_op
 
-	ends
-
diff --git a/z80x/z80x_mn.x86 b/z80x/z80x_mn.x86
index b40528e..4ae9ec4 100644
--- a/z80x/z80x_mn.x86
+++ b/z80x/z80x_mn.x86
@@ -852,6 +852,3 @@ opcode_main	dd	ld_nop,		ld_bc_word,	ld_xbc_a,	inc_bc			; 00
 			dd	ret_m,		ld_sp_hl,	jp_m,		_ei
 			dd	call_m,		_fd,		cp_byte,	rst_38
 
-
-	ends
-
diff --git a/z80x/z80x_sb.x86 b/z80x/z80x_sb.x86
index 074b397..896f00d 100644
--- a/z80x/z80x_sb.x86
+++ b/z80x/z80x_sb.x86
@@ -629,5 +629,3 @@ opcode_ed	dd	ld_nop,		ld_nop,		ld_nop,		ld_nop			; 00
 			dd	ld_nop,		ld_nop,		ld_nop,		ld_nop
 			dd	ld_nop,		ld_nop,		ld_nop,		ld_nop
 
-	ends
-
diff --git a/z80x/z80xmem.x86 b/z80x/z80xmem.x86
index 3c53569..8b2a4b4 100644
--- a/z80x/z80xmem.x86
+++ b/z80x/z80xmem.x86
@@ -106,5 +106,3 @@ memwr16_ecx_dx:	cmp		cx, 0xffff
 				mov		[eax], dh
 				ret
 
-	ends
-