diff --git a/README.md b/README.md
index 984ce3a..481d433 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ emulation using RunZ80, SIMH or ZXCC.
 Each release is a consolidated milestone with various updates and
 patches applied.
 
-The latest release is V3.09-15 (see Modification History below).
+The latest release is V3.09-16 (see Modification History below).
 
 If you only wish to download the latest binary distribution, download
 it from
@@ -1509,5 +1509,28 @@ versions LIB280C.LIB and LIB280F.LIB), and I've bumped the release
 to V3.09-15.
 
 
+## Fixes to the compiler driver
+
+As reported by Mark Ogden, there are a couple of bugs in the compiler
+driver program.
+
+* The first is regarding the use of the self-relocating (-A) option,
+where the code compiled for the linker should use the ```cpm``` psect 
+segment (as per the relocatable start-up module RRTCPM.OBJ); and
+
+* If you specify a .SYM file on the command line without specifying
+the overlay (-Y) option, the compiler driver tries to assemble a
+non-existing temporary file.
+
+The latest compiler driver (in cpm/C309-16.C) addresses both by passing
+the ```cpm``` psect to the linker and ignores .SYM files unless the
+overlay (-Y) option is specified.
+
+The binaries for the compiler driver (in dist//C309-16.COM and
+z280dist/C280-16.COM) have been updated as well as the binary distribution
+library files to be release V3.09-16 (download link at the top of
+this README file).
+
+
 --
-Tony Nicholson, Tuesday 24-May-2022
+Tony Nicholson, Tuesday 09-Aug-2022
diff --git a/cpm/BUILD-C.LOG b/cpm/BUILD-C.LOG
index 145af9a..ae9486d 100644
--- a/cpm/BUILD-C.LOG
+++ b/cpm/BUILD-C.LOG
@@ -2,76 +2,76 @@
 10E>;
 10E>date
 A:DATE     COM  (User 0)
-
Tue 24/05/2022 11:10:10
+
Tue 09/08/2022 09:24:28
 10E>;
 10E>; Build Z80 version
-10E>c -o -v c309-15.c
+10E>c -o -v c309-16.c
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-14
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
-0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: C309-15.C M:$CTMP1.$$$
+0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: C309-16.C M:$CTMP1.$$$
 0:A:P1 M:$CTMP1.$$$ M:$CTMP2.$$$ M:$CTMP3.$$$
 0:A:CGEN M:$CTMP2.$$$ M:$CTMP1.$$$
 0:A:OPTIM M:$CTMP1.$$$ M:$CTMP2.$$$
-0:A:ZAS -J -N -OC309-15.OBJ M:$CTMP2.$$$
+0:A:ZAS -J -N -OC309-16.OBJ M:$CTMP2.$$$
 ERA M:$CTMP1.$$$
 ERA M:$CTMP2.$$$
 ERA M:$CTMP3.$$$
 ERA M:$CTMP5.$$$
-0:A:LINQ -Z -Ptext=0,data,bss -C100H -OC309-15.COM 0:A:CRTCPM.OBJ C309-15.OBJ 0:A:LIBC.LIB
-ERA C309-15.OBJ
+0:A:LINQ -Z -Ptext=0,data,bss -C100H -OC309-16.COM 0:A:CRTCPM.OBJ C309-16.OBJ 0:A:LIBC.LIB
+ERA C309-16.OBJ
 ERA M:$$EXEC.$$$
 
 10E>;
 10E>; Now build Z280 version
 10E>;
 10E>; First a Z280 version using the Z80 LIBC.LIB (runs on Z80)
-10E>c309-15 -o -v -ec280z80.com -dZ280 c309-15.c
-E:C309-15  COM
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+10E>c309-16 -o -v -ec280z80.com -dZ280 c309-16.c
+E:C309-16  COM
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
-0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: C309-15.C M:$CTMP1.$$$
+0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: C309-16.C M:$CTMP1.$$$
 0:A:P1 M:$CTMP1.$$$ M:$CTMP2.$$$ M:$CTMP3.$$$
 0:A:CGEN M:$CTMP2.$$$ M:$CTMP1.$$$
 0:A:OPTIM M:$CTMP1.$$$ M:$CTMP2.$$$
-0:A:ZAS -J -N -OC309-15.OBJ M:$CTMP2.$$$
+0:A:ZAS -J -N -OC309-16.OBJ M:$CTMP2.$$$
 ERA M:$CTMP1.$$$
 ERA M:$CTMP2.$$$
 ERA M:$CTMP3.$$$
 ERA M:$CTMP5.$$$
-0:A:LINQ -Z -Ptext=0,data,bss -C100H -OC280Z80.COM 0:A:CRTCPM.OBJ C309-15.OBJ 0:A:LIBC.LIB
-ERA C309-15.OBJ
+0:A:LINQ -Z -Ptext=0,data,bss -C100H -OC280Z80.COM 0:A:CRTCPM.OBJ C309-16.OBJ 0:A:LIBC.LIB
+ERA C309-16.OBJ
 ERA M:$$EXEC.$$$
 
 10E>;
 10E>; and the Z280 optimized version from it (only runs on a Z280)
-10E>c280z80 -of2 -v -ec280-15.com c309-15.c
+10E>c280z80 -of2 -v -ec280-16.com c309-16.c
 E:C280Z80  COM
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
-0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: C309-15.C M:$CTMP1.$$$
+0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: C309-16.C M:$CTMP1.$$$
 0:A:P1 M:$CTMP1.$$$ M:$CTMP2.$$$ M:$CTMP3.$$$
 0:A:CGEN M:$CTMP2.$$$ M:$CTMP1.$$$
 0:A:OPTIM -F M:$CTMP1.$$$ M:$CTMP2.$$$
 0:A:OPTIMH -F M:$CTMP2.$$$ M:$CTMP5.$$$
- 516 bytes optimized away
- 1626 bytes replaced
-0:A:ZAS -N -OC309-15.OBJ M:$CTMP5.$$$
+ 515 bytes optimized away
+ 1616 bytes replaced
+0:A:ZAS -N -OC309-16.OBJ M:$CTMP5.$$$
 ERA M:$CTMP1.$$$
 ERA M:$CTMP2.$$$
 ERA M:$CTMP3.$$$
 ERA M:$CTMP5.$$$
-0:A:LINQ -Z -Ptext=0,data,bss -C100H -OC280-15.COM 0:A:C280CPM.OBJ C309-15.OBJ 0:A:LIB280C.LIB
-ERA C309-15.OBJ
+0:A:LINQ -Z -Ptext=0,data,bss -C100H -OC280-16.COM 0:A:C280CPM.OBJ C309-16.OBJ 0:A:LIB280C.LIB
+ERA C309-16.OBJ
 ERA M:$$EXEC.$$$
 
 10E>;
-10E>c280-15 -o2 -v optimh.c
-E:C280-15  COM
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+10E>c280-16 -o2 -v optimh.c
+E:C280-16  COM
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: OPTIMH.C M:$CTMP1.$$$
@@ -103,12 +103,12 @@ Directory For Drive E:  User 10
     Name     Bytes   Recs   Attributes   Prot      Update          Create    
 ------------ ------ ------ ------------ ------ --------------  --------------
 
-C280-15  COM    24k    192 Dir RW       None   24/05/22 11:20  24/05/22 11:20
-C280Z80  COM    28k    208 Dir RW       None   24/05/22 11:16  24/05/22 11:16
-C309-15  COM    28k    201 Dir RW       None   24/05/22 11:13  24/05/22 11:13
+C280-16  COM    24k    192 Dir RW       None   09/08/22 09:34  09/08/22 09:34
+C280Z80  COM    28k    208 Dir RW       None   09/08/22 09:30  09/08/22 09:30
+C309-16  COM    28k    201 Dir RW       None   09/08/22 09:27  09/08/22 09:27
 
 Total Bytes     =     80k  Total Records =     601  Files Found =    3
-Total 1k Blocks =     76   Used/Max Dir Entries For Drive E: 1134/2048
+Total 1k Blocks =     76   Used/Max Dir Entries For Drive E: 1137/2048
 
 10E>dir optimh.com [fu
 A:DIR      COM  (User 0)
@@ -120,10 +120,10 @@ Directory For Drive E:  User 10
     Name     Bytes   Recs   Attributes   Prot      Update          Create    
 ------------ ------ ------ ------------ ------ --------------  --------------
 
-OPTIMH   COM    20k    144 Dir RW       None   24/05/22 11:22  24/05/22 11:22
+OPTIMH   COM    20k    144 Dir RW       None   09/08/22 09:36  09/08/22 09:36
 
 Total Bytes     =     20k  Total Records =     144  Files Found =    1
-Total 1k Blocks =     18   Used/Max Dir Entries For Drive E: 1134/2048
+Total 1k Blocks =     18   Used/Max Dir Entries For Drive E: 1137/2048
 
 10E>;
 10E>; Done
diff --git a/cpm/C309-15.C b/cpm/C309-16.C
similarity index 96%
rename from cpm/C309-15.C
rename to cpm/C309-16.C
index 6d2b4f4..3d8b264 100644
--- a/cpm/C309-15.C
+++ b/cpm/C309-16.C
@@ -9,7 +9,7 @@
  *  processor is prohibited.
  */
 
-#define	VERSION	"V3.09-15"
+#define	VERSION	"V3.09-16"
 
 /*----------------------------------------------------------------------*\
  | Note by Jon Saxton, 3 May 2014.					|
@@ -170,7 +170,7 @@ static char *tempm[] =
 {
     "-Ptext=0%xh,data",
     "-Ptext=0,data,bss",
-    "-Ptext=0%xh,data,bss",
+    "-Pcpm=0,text,data,bss,stack",
 };
 
 #define tmpf1       temps[0]
@@ -398,16 +398,21 @@ int main(int argc, char **argv)
         }
         else if (cp && (strcmp(cp, ".SYM")==0 ))
             {
-                c_as[c_as_idx++] = argv[0];
-                if (xp = rindex(argv[0], ':'))
-                    xp++;
+                if (overlay)
+                    {
+                        c_as[c_as_idx++] = argv[0];
+                        if (xp = rindex(argv[0], ':'))
+                            xp++;
+                        else
+                            xp = argv[0];
+                        *cp = 0;
+                        strcat(strcpy(tmpbuf, xp), ".OBJ");
+                        addobj(tmpbuf, 1);
+                        strcpy(single, tmpbuf);
+                        *cp = '.';
+                    }
                 else
-                    xp = argv[0];
-                *cp = 0;
-                strcat(strcpy(tmpbuf, xp), ".OBJ");
-                addobj(tmpbuf, 1);
-                strcpy(single, tmpbuf);
-                *cp = '.';
+                    fprintf(stderr,"%s ignored as -Y option missing\n",argv[0]);
             }
         else
             addobj(argv[0], 0);
@@ -500,15 +505,9 @@ void doit()
         else
         {
             if (reloc)
-            {
-                segopt = xalloc(strlen(rsegs)+10);
-                sprintf(segopt, rsegs, cbase);
-            }
+                segopt = rsegs;
             else
-            {
-                segopt = xalloc(strlen(nsegs)+1);
-                sprintf(segopt, nsegs);
-            }
+                segopt = nsegs;
         }
         flgs[flg_idx++] = segopt;
         if (!outfile)
@@ -764,8 +763,10 @@ void assemble_sym(char *s)
     if (c_as_idx > 1)
         print(s);
     i = 0;
+  /* Commented out - for symbols there's no code to optimize
     if (optimize && !speed)
         vec[i++] = "-J";
+  */
     if (nolocal)
         vec[i++] = "-X";
     if (cp = rindex(s, ':'))
diff --git a/dist/C309-15.COM b/dist/C309-15.COM
deleted file mode 100644
index 3cac51f..0000000
Binary files a/dist/C309-15.COM and /dev/null differ
diff --git a/dist/C309-16.COM b/dist/C309-16.COM
new file mode 100644
index 0000000..d8349cd
Binary files /dev/null and b/dist/C309-16.COM differ
diff --git a/htc-bin.lbr b/htc-bin.lbr
index a6216cb..cdf433f 100644
Binary files a/htc-bin.lbr and b/htc-bin.lbr differ
diff --git a/test/TEST.LOG b/test/TEST.LOG
index 54d8650..11777c3 100644
--- a/test/TEST.LOG
+++ b/test/TEST.LOG
@@ -1,11 +1,11 @@
 
 10E>date
 A:DATE     COM  (User 0)
-
Tue 24/05/2022 11:43:14
+
Tue 09/08/2022 09:49:50
 10E>; Compile all tests
 10E>c -v -o testver.c
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTVER.C M:$CTMP1.$$$
@@ -23,7 +23,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -v -o testio.c
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTIO.C M:$CTMP1.$$$
@@ -41,7 +41,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -v -o testuid.c
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTUID.C M:$CTMP1.$$$
@@ -59,7 +59,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -v -o teststr.c
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTSTR.C M:$CTMP1.$$$
@@ -77,7 +77,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -v -o testbios.c
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTBIOS.C M:$CTMP1.$$$
@@ -95,7 +95,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -v -o testbdos.c
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTBDOS.C M:$CTMP1.$$$
@@ -113,7 +113,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -v -o testtrig.c -lf
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTTRIG.C M:$CTMP1.$$$
@@ -131,7 +131,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -v -o testftim.c
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTFTIM.C M:$CTMP1.$$$
@@ -149,7 +149,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -v -o testfile.c
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTFILE.C M:$CTMP1.$$$
@@ -167,7 +167,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -v -o testaes.c
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTAES.C M:$CTMP1.$$$
@@ -185,7 +185,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -v -o testrc.c
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTRC.C M:$CTMP1.$$$
@@ -203,7 +203,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -v -o testview.c
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTVIEW.C M:$CTMP1.$$$
@@ -221,7 +221,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -v -o testwild.c
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTWILD.C M:$CTMP1.$$$
@@ -239,7 +239,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -ftestovrx.sym -v -o testovr.c -lovr
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTOVR.C M:$CTMP1.$$$
@@ -257,7 +257,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -y -o -v testovr2.c testovrx.sym
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 TESTOVR2.C
@@ -268,7 +268,7 @@ TESTOVR2.C
 0:A:ZAS -J -N -OTESTOVR2.OBJ M:$CTMP2.$$$
 0:A:SYMTOAS TESTOVRX.SYM M:$CTMP5.$$$
 TESTOVRX.SYM
-0:A:ZAS -J -OTESTOVRX.OBJ M:$CTMP5.$$$
+0:A:ZAS -OTESTOVRX.OBJ M:$CTMP5.$$$
 ERA M:$CTMP1.$$$
 ERA M:$CTMP2.$$$
 ERA M:$CTMP3.$$$
@@ -278,7 +278,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -y -o -v testovr1.c testovrx.sym
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 TESTOVR1.C
@@ -289,7 +289,7 @@ TESTOVR1.C
 0:A:ZAS -J -N -OTESTOVR1.OBJ M:$CTMP2.$$$
 0:A:SYMTOAS TESTOVRX.SYM M:$CTMP5.$$$
 TESTOVRX.SYM
-0:A:ZAS -J -OTESTOVRX.OBJ M:$CTMP5.$$$
+0:A:ZAS -OTESTOVRX.OBJ M:$CTMP5.$$$
 ERA M:$CTMP1.$$$
 ERA M:$CTMP2.$$$
 ERA M:$CTMP3.$$$
@@ -299,7 +299,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -a -v -o testhell.c
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTHELL.C M:$CTMP1.$$$
@@ -311,7 +311,7 @@ ERA M:$CTMP1.$$$
 ERA M:$CTMP2.$$$
 ERA M:$CTMP3.$$$
 ERA M:$CTMP5.$$$
-0:A:LINQ -Z -L -Ptext=0100h,data,bss -OM:$L.OBJ 0:A:RRTCPM.OBJ TESTHELL.OBJ 0:A:LIBC.LIB
+0:A:LINQ -Z -L -Pcpm=0,text,data,bss,stack -OM:$L.OBJ 0:A:RRTCPM.OBJ TESTHELL.OBJ 0:A:LIBC.LIB
 0:A:OBJTOHEX -R -B100H M:$L.OBJ TESTHELL.COM
 ERA M:$L.OBJ
 ERA TESTHELL.OBJ
@@ -319,7 +319,7 @@ ERA M:$$EXEC.$$$
 
 10E>c -v -o testpr.c
 A:C        COM  (User 0)
-Hi-Tech Z80 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z80 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -I0:A: TESTPR.C M:$CTMP1.$$$
@@ -394,7 +394,7 @@ strnicmp test:
 10E>testbios
 E:TESTBIOS COM
 Z3ENV is not established.  (This is not an error.)
-Press a key: rc = 0078, character = x
+Press a key: rc = 007A, character = z
 The next message should say "Did this work?"
 Did this work?
 
@@ -458,8 +458,8 @@ E:TESTTRIG COM
 
 10E>testftim
 E:TESTFTIM COM
-34: 11:55 AM
-Tue May 24 11:55:10 2022
+34: 10:01 AM
+Tue Aug 09 10:01:11 2022
 
 
 10E>testfile
diff --git a/test/TEST280.LOG b/test/TEST280.LOG
index 6e096c3..9bbbe5b 100644
--- a/test/TEST280.LOG
+++ b/test/TEST280.LOG
@@ -1,11 +1,11 @@
 
 10E>date
 A:DATE     COM  (User 0)
-
Tue 24/05/2022 11:29:50
+
Tue 09/08/2022 10:01:41
 10E>; Compile all test280
 10E>c280 -v -o2 testver.c
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTVER.C M:$CTMP1.$$$
@@ -26,7 +26,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -v -o2 testio.c
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTIO.C M:$CTMP1.$$$
@@ -47,7 +47,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -v -o2 testuid.c
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTUID.C M:$CTMP1.$$$
@@ -68,7 +68,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -v -o2 teststr.c
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTSTR.C M:$CTMP1.$$$
@@ -89,7 +89,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -v -o2 testbios.c
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTBIOS.C M:$CTMP1.$$$
@@ -110,7 +110,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -v -o2 testbdos.c
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTBDOS.C M:$CTMP1.$$$
@@ -131,7 +131,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -v -o2 testtrig.c -lf
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTTRIG.C M:$CTMP1.$$$
@@ -152,7 +152,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -v -o2 testftim.c
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTFTIM.C M:$CTMP1.$$$
@@ -173,7 +173,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -v -o2 testfile.c
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTFILE.C M:$CTMP1.$$$
@@ -194,7 +194,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -v -o2 testaes.c
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTAES.C M:$CTMP1.$$$
@@ -215,7 +215,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -v -o2 testrc.c
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTRC.C M:$CTMP1.$$$
@@ -236,7 +236,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -v -o2 testview.c
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTVIEW.C M:$CTMP1.$$$
@@ -257,7 +257,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -v -o2 testwild.c
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTWILD.C M:$CTMP1.$$$
@@ -278,7 +278,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -ftestovrx.sym -v -o2 testovr.c -lovr
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTOVR.C M:$CTMP1.$$$
@@ -299,7 +299,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -y -o2 -v testovr2.c testovrx.sym
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 TESTOVR2.C
@@ -313,7 +313,7 @@ TESTOVR2.C
 0:A:ZAS -J -N -OTESTOVR2.OBJ M:$CTMP5.$$$
 0:A:SYMTOAS TESTOVRX.SYM M:$CTMP5.$$$
 TESTOVRX.SYM
-0:A:ZAS -J -OTESTOVRX.OBJ M:$CTMP5.$$$
+0:A:ZAS -OTESTOVRX.OBJ M:$CTMP5.$$$
 ERA M:$CTMP1.$$$
 ERA M:$CTMP2.$$$
 ERA M:$CTMP3.$$$
@@ -323,7 +323,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -y -o2 -v testovr1.c testovrx.sym
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 TESTOVR1.C
@@ -337,7 +337,7 @@ TESTOVR1.C
 0:A:ZAS -J -N -OTESTOVR1.OBJ M:$CTMP5.$$$
 0:A:SYMTOAS TESTOVRX.SYM M:$CTMP5.$$$
 TESTOVRX.SYM
-0:A:ZAS -J -OTESTOVRX.OBJ M:$CTMP5.$$$
+0:A:ZAS -OTESTOVRX.OBJ M:$CTMP5.$$$
 ERA M:$CTMP1.$$$
 ERA M:$CTMP2.$$$
 ERA M:$CTMP3.$$$
@@ -347,7 +347,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -a -v -o2 testhell.c -lc
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTHELL.C M:$CTMP1.$$$
@@ -362,7 +362,7 @@ ERA M:$CTMP1.$$$
 ERA M:$CTMP2.$$$
 ERA M:$CTMP3.$$$
 ERA M:$CTMP5.$$$
-0:A:LINQ -Z -L -Ptext=0100h,data,bss -OM:$L.OBJ 0:A:R280CPM.OBJ TESTHELL.OBJ 0:A:LIB280C.LIB 0:A:LIB280C.LIB
+0:A:LINQ -Z -L -Pcpm=0,text,data,bss,stack -OM:$L.OBJ 0:A:R280CPM.OBJ TESTHELL.OBJ 0:A:LIB280C.LIB 0:A:LIB280C.LIB
 0:A:OBJTOHEX -R -B100H M:$L.OBJ TESTHELL.COM
 ERA M:$L.OBJ
 ERA TESTHELL.OBJ
@@ -370,7 +370,7 @@ ERA M:$$EXEC.$$$
 
 10E>c280 -v -o2 testpr.c
 A:C280     COM  (User 0)
-Hi-Tech Z280 C Compiler (CP/M-80) V3.09-15
+Hi-Tech Z280 C Compiler (CP/M-80) V3.09-16
 Copyright (C) 1984-87 HI-TECH SOFTWARE
 Updated from https://github.com/agn453/HI-TECH-Z80-C
 0:A:CPP -DCPM -DHI_TECH_C -Dz80 -DZ280 -I0:A: TESTPR.C M:$CTMP1.$$$
@@ -512,8 +512,8 @@ E:TESTTRIG COM
 
 10E>testftim
 E:TESTFTIM COM
-34: 11:42 AM
-Tue May 24 11:42:46 2022
+34: 10:13 AM
+Tue Aug 09 10:13:34 2022
 
 
 10E>testfile
diff --git a/z280bin.lbr b/z280bin.lbr
index 7f86f19..23e0005 100644
Binary files a/z280bin.lbr and b/z280bin.lbr differ
diff --git a/z280dist/C280-15.COM b/z280dist/C280-15.COM
deleted file mode 100644
index 2e911b6..0000000
Binary files a/z280dist/C280-15.COM and /dev/null differ
diff --git a/z280dist/C280-16.COM b/z280dist/C280-16.COM
new file mode 100644
index 0000000..d9aec4a
Binary files /dev/null and b/z280dist/C280-16.COM differ