diff --git a/Makefile b/Makefile
index f16dde0..991f3cb 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ all: bwbasic renum
 	ls -l bwbasic renum
 
 bwbasic: bw*.c bw*.h
-	$(CC) $(CFLAGS) -o bwbasic bw*.c $(LIB) -DLINUX
+	$(CC) $(CFLAGS) -o bwbasic bw*.c $(LIB)
 
 renum: renum.c
 	$(CC) $(CFLAGS) -o renum renum.c $(LIB) 
diff --git a/bwbasic.c b/bwbasic.c
index 6113862..2f4ec13 100644
--- a/bwbasic.c
+++ b/bwbasic.c
@@ -36,7 +36,7 @@
 /*                                                               */
 /* Version 3.20 by Howard Wulf, AF5NE                            */
 /*                                                               */
-/* Version 3.20d by Ken Martin                                   */
+/* Version 3.20f by KenUNIX & Chipmaster                         */
 /*                                                               */
 /*---------------------------------------------------------------*/
 
@@ -83,11 +83,11 @@ static char *Banner[] = {
   "                                    ##     ## ##     ## ##    ##  ##  ##    ##",
   "                                    ########  ##     ##  ######  ####  ###### ",
   "                                                                              ",
-  "Bywater BASIC Interpreter, version 3.20d                                      ",
+  "Bywater BASIC Interpreter, version 3.20f                                      ",
   "Copyright (c) 1993, Ted A. Campbell                                           ",
   "Copyright (c) 1995-1997  , Jon B. Volkoff                                     ",
   "Copyright (c) 2014-2017  , Howard Wulf, AF5NE                                 ",
-  "              2019-2020  , Ken Martin                                         ",
+  "              2019-2021  , KenUNIX & Chipmaster with fixes                    ",
   "                                                                              ",
   NULL
 };
@@ -701,7 +701,7 @@ execute_profile (char *FileName)
 
   My->NextValidLineNumber = MINLIN;
 
-#ifdef LINUX
+#ifdef HAVE_UNIX
 /* Begin 20200806 ChipMaster@YeOlPiShack.net  Patch --
  *
  *    on *nix check the current folder, user's home folder and then /etc for
diff --git a/compile.bat b/compile.bat
index 5d654d7..dee19e0 100644
--- a/compile.bat
+++ b/compile.bat
@@ -6,14 +6,14 @@ echo                             added notes for 32 bit
 echo.
 echo Source - https://sourceforge.net/projects/tdm-gcc/files/TDM-GCC%20Installer/tdm64-gcc-5.1.0-2.exe/download
 echo.
-echo                           Tested under bwbasic-3.20d
+echo                           Tested under bwbasic-3.20f
 echo.
 echo                                      Wait
 echo.
 
 if exist *.o del *.o
 if exist bwbasic.exe del bwbasic.exe
-if exist renum.exe del renum.exe
+if exist renum2.exe del renum2.exe
 
 call stdcomp bwbasic.c
 call stdcomp bwb_int.c
@@ -33,17 +33,17 @@ call stdcomp bwd_cmd.c
 call stdcomp bwd_fun.c
 
 Rem If compiling under DOS 32 bit (gcc 5.1.0) add -m32 after -s
-gcc -s -ansi -DMSDOS -o bwbasic.exe bwb_cmd.o bwb_cnd.o bwb_dio.o bwb_exp.o bwb_fnc.o bwb_inp.o bwb_int.o bwb_prn.o bwb_stc.o bwb_str.o bwb_tbl.o bwb_var.o bwbasic.o bwd_cmd.o bwd_fun.o bwx_tty.o
+gcc -s -m32 -ansi -DMSDOS -o bwbasic.exe bwb_cmd.o bwb_cnd.o bwb_dio.o bwb_exp.o bwb_fnc.o bwb_inp.o bwb_int.o bwb_prn.o bwb_stc.o bwb_str.o bwb_tbl.o bwb_var.o bwbasic.o bwd_cmd.o bwd_fun.o bwx_tty.o
 
 Rem If compiling under DOS 32 bit (gcc 5.1.0) add -m32 after -s
-gcc -s -ansi -DMSDOS -o renum.exe renum.c 
+gcc -s -m32 -ansi -DMSDOS -o renum2.exe renum2.c 
 
-if exist "renum.exe" (
+if exist "renum2.exe" (
   echo.
-  echo Compile suceeded for renum.exe.
+  echo Compile suceeded for renum2.exe.
 ) else (
   echo.
-  echo Compile FAILED for renum.exe.
+  echo Compile FAILED for renum2.exe.
 )
 
 if exist "bwbasic.exe" (
diff --git a/stdcomp.bat b/stdcomp.bat
index 63f2189..e10c7a9 100644
--- a/stdcomp.bat
+++ b/stdcomp.bat
@@ -1,5 +1,3 @@
 Rem If compiling under DOS 32 bit (gcc 5.1.0) add -m32 after -w
-Rem If compiling under DOS 32 bit (gcc 5.1.0) add -m32 after -w
-gcc -w -c -ansi -DMSDOS -I . %1 %2 %3 %4 %5 %6 %7 %8 %9
-
+gcc -w -m32 -c -ansi -DMSDOS -I . %1 %2 %3 %4 %5 %6 %7 %8 %9