diff --git a/ReadMe.md b/ReadMe.md
index 30d63d60..1330efb6 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -11,7 +11,7 @@ Oberon programs under Unix, Mac or Windows. Vishap Oberon includes
 libraries from the Ulm, oo2c and Ofront Oberon compilers, as well as
 default libraries complying with the Oakwood Guidelines for Oberon-2 compilers.
 
-#### Contents
+### Contents
 
 &nbsp;&nbsp;&nbsp;&nbsp;[**Installation**](#installation)<br>
 &nbsp;&nbsp;&nbsp;&nbsp;[**A 'Hello' application**](#a-hello-application)<br>
@@ -30,7 +30,7 @@ default libraries complying with the Oakwood Guidelines for Oberon-2 compilers.
 While pre-built packages are not provided, it is easy to install the Oberon compiler and libraries
 with the following simple steps.
 
-###### 1. Install prerequisites
+#### 1. Install prerequisites
 
 | Platform               | Packages                                                            |
 | ---------              | ------------                                                        |
@@ -42,7 +42,7 @@ with the following simple steps.
 
 More details, including for MingW and MS C, in [**Installation**](/doc/Installation.md).
 
-###### 2. Build and install the compiler and libraries
+#### 2. Build and install the compiler and libraries
 
 1. `git clone https://github.com/vishaps/voc`
 2. `cd voc`
@@ -50,7 +50,7 @@ More details, including for MingW and MS C, in [**Installation**](/doc/Installat
 
 Since 'make full' will install the compiler and libraries, it needs root (unix) or administrator (windows) privileges.
 
-###### 3. Stet your PATH environment variable
+#### 3. Stet your PATH environment variable
 
 Set your path to the installed compiler binary location as reported
 by make full, e.g.
@@ -143,7 +143,7 @@ For details, including how to add support for unrecognised systems, see
 
 Vishap Oberon supports the Oberon 2 programming language, including type-bound procedures. SYSTEM.Mod includes additional functionality and some changes for 64 bit support.
 
-##### Integer and set type sizes:
+#### Integer and set type sizes:
 
 | Type     | -O2 option (default) | -OC option |
 | ---      | ---                  | ---        |
@@ -152,7 +152,7 @@ Vishap Oberon supports the Oberon 2 programming language, including type-bound p
 | LONGINT  | 32 bit               | 64 bit     |
 | SET      | 32 bit               | 64 bit     |
 
-##### Libraries
+#### Libraries
 
 Included libraries ease porting of code from the major Oberon systems:
 
@@ -186,7 +186,7 @@ David Brown has worked on adding support for more platforms incuding windows usi
 
 ## Origin of the name "Ѵishap Oberon"
 
-###### Oberon
+#### Oberon
 
 Oberon is a programming language, an operating system and a graphical
 user interface. Originally designed and implemented by by Niklaus Wirth and
@@ -205,7 +205,7 @@ of Einstein and Antoine de Saint-Exupéry:
 >  when there is no longer anything to take away. (Antoine de Saint-Exupéry,
 >  translated by Lewis Galantière.)
 
-###### Ѵishap
+#### Ѵishap
 
 Vishaps are dragons inhabiting the Armenian Highlands.
 We decided to name the project “Vishap” because ties between compilers and dragons have ancient traditions.
diff --git a/bootstrap/SYSTEM.h b/bootstrap/SYSTEM.h
index fb88276c..3f3b6133 100644
--- a/bootstrap/SYSTEM.h
+++ b/bootstrap/SYSTEM.h
@@ -26,6 +26,9 @@
 #define _SIZE_T_DEFINED_ // For OpenBSD
 
 void *memcpy(void *dest, const void *source, size_t size);
+#if defined _WIN32
+#define alloca _alloca
+#endif
 void *alloca(size_t size);
 
 
diff --git a/bootstrap/unix-44/extTools.c b/bootstrap/unix-44/extTools.c
index 8ed00f14..aa59dd88 100644
--- a/bootstrap/unix-44/extTools.c
+++ b/bootstrap/unix-44/extTools.c
@@ -104,6 +104,7 @@ void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN stati
 	Strings_Append((CHAR*)" -l voc", 8, (void*)cmd, 1023);
 	Strings_Append((CHAR*)"-O", 3, (void*)cmd, 1023);
 	Strings_Append(OPM_Model, 10, (void*)cmd, 1023);
+	Strings_Append((CHAR*)"", 1, (void*)cmd, 1023);
 	extTools_execute((CHAR*)"Assemble and link: ", 20, cmd, 1023);
 	__DEL(additionalopts);
 }
diff --git a/bootstrap/unix-48/extTools.c b/bootstrap/unix-48/extTools.c
index 8ed00f14..aa59dd88 100644
--- a/bootstrap/unix-48/extTools.c
+++ b/bootstrap/unix-48/extTools.c
@@ -104,6 +104,7 @@ void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN stati
 	Strings_Append((CHAR*)" -l voc", 8, (void*)cmd, 1023);
 	Strings_Append((CHAR*)"-O", 3, (void*)cmd, 1023);
 	Strings_Append(OPM_Model, 10, (void*)cmd, 1023);
+	Strings_Append((CHAR*)"", 1, (void*)cmd, 1023);
 	extTools_execute((CHAR*)"Assemble and link: ", 20, cmd, 1023);
 	__DEL(additionalopts);
 }
diff --git a/bootstrap/unix-88/extTools.c b/bootstrap/unix-88/extTools.c
index 8ed00f14..aa59dd88 100644
--- a/bootstrap/unix-88/extTools.c
+++ b/bootstrap/unix-88/extTools.c
@@ -104,6 +104,7 @@ void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN stati
 	Strings_Append((CHAR*)" -l voc", 8, (void*)cmd, 1023);
 	Strings_Append((CHAR*)"-O", 3, (void*)cmd, 1023);
 	Strings_Append(OPM_Model, 10, (void*)cmd, 1023);
+	Strings_Append((CHAR*)"", 1, (void*)cmd, 1023);
 	extTools_execute((CHAR*)"Assemble and link: ", 20, cmd, 1023);
 	__DEL(additionalopts);
 }
diff --git a/bootstrap/windows-48/extTools.c b/bootstrap/windows-48/extTools.c
index 8ed00f14..aa59dd88 100644
--- a/bootstrap/windows-48/extTools.c
+++ b/bootstrap/windows-48/extTools.c
@@ -104,6 +104,7 @@ void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN stati
 	Strings_Append((CHAR*)" -l voc", 8, (void*)cmd, 1023);
 	Strings_Append((CHAR*)"-O", 3, (void*)cmd, 1023);
 	Strings_Append(OPM_Model, 10, (void*)cmd, 1023);
+	Strings_Append((CHAR*)"", 1, (void*)cmd, 1023);
 	extTools_execute((CHAR*)"Assemble and link: ", 20, cmd, 1023);
 	__DEL(additionalopts);
 }
diff --git a/bootstrap/windows-88/extTools.c b/bootstrap/windows-88/extTools.c
index 8ed00f14..aa59dd88 100644
--- a/bootstrap/windows-88/extTools.c
+++ b/bootstrap/windows-88/extTools.c
@@ -104,6 +104,7 @@ void extTools_LinkMain (CHAR *moduleName, LONGINT moduleName__len, BOOLEAN stati
 	Strings_Append((CHAR*)" -l voc", 8, (void*)cmd, 1023);
 	Strings_Append((CHAR*)"-O", 3, (void*)cmd, 1023);
 	Strings_Append(OPM_Model, 10, (void*)cmd, 1023);
+	Strings_Append((CHAR*)"", 1, (void*)cmd, 1023);
 	extTools_execute((CHAR*)"Assemble and link: ", 20, cmd, 1023);
 	__DEL(additionalopts);
 }
diff --git a/make.cmd b/make.cmd
index 5ff269df..80ab98d4 100644
--- a/make.cmd
+++ b/make.cmd
@@ -16,7 +16,7 @@
 
 :: Create configuration and parameter files.
 
-cl -nologo -Isrc\system src\tools\make\configure.c >nul
+cl -nologo -Isrc\runtime src\tools\make\configure.c >nul
 setlocal
 configure.exe >nul
 del configure.obj configure.exe 2>nul
@@ -27,7 +27,8 @@ for /F "delims='=' tokens=1,2" %%a in (Configuration.make) do set %%a=%%b
 
 set FLAVOUR=%OS%.%DATAMODEL%.%COMPILER%
 set BUILDDIR=build\%FLAVOUR%
-set VISHAP=%ONAME%%BINEXT%
+set OBECOMP=%ONAME%%BINEXT%
+set MODEL=2
 
 for /F %%d in ('cd');do set ROOTDIR=%%d
 
@@ -62,11 +63,17 @@ goto :eof
 
 
 :full
+whoami /groups | find "12288" >nul
+if errorlevel 1 (
+echo make full - administrator rights required. Please run under an administrator command prompt.
+goto :eof
+)
 call :clean      || exit /b
 call :compiler   || exit /b
 call :browsercmd || exit /b
 call :library    || exit /b
 call :install    || exit /b
+call :showpath   || exit /b
 goto :eof
 
 
@@ -80,23 +87,9 @@ goto :eof
 
 
 
-:library
-call :v4            || exit /b
-call :ooc2          || exit /b
-call :ooc           || exit /b
-call :ulm           || exit /b
-call :pow32         || exit /b
-call :misc          || exit /b
-call :s3            || exit /b
-call :librarybinary || exit /b
-goto :eof
-
-
-
-
 :clean
 rd /s /q %BUILDDIR% 2>nul
-del /q %VISHAP% 2>nul
+del /q %OBECOMP% 2>nul
 goto :eof
 
 
@@ -111,7 +104,7 @@ echo.    PLATFORM:  %PLATFORM%
 echo.    OS:        %OS%
 echo.    BUILDDIR:  %BUILDDIR%
 echo.  Oberon characteristics:
-echo.    INTSIZE:   %INTSIZE%
+echo.    MODEL:     %MODEL%
 echo.    ADRSIZE:   %ADRSIZE%
 echo.    ALIGNMENT: %ALIGNMENT%
 echo.  C compiler:
@@ -122,19 +115,21 @@ echo.    DATAMODEL: %DATAMODEL%
 cd %BUILDDIR%
 
 cl -nologo /Zi -c SYSTEM.c  Configuration.c Platform.c Heap.c   || exit /b
-cl -nologo /Zi -c Console.c Strings.c       Modules.c  Files.c  || exit /b
+cl -nologo /Zi -c Out.c     Strings.c       Modules.c  Files.c  || exit /b
 cl -nologo /Zi -c Reals.c   Texts.c         vt100.c    errors.c || exit /b
 cl -nologo /Zi -c OPM.c     extTools.c      OPS.c      OPT.c    || exit /b
 cl -nologo /Zi -c OPC.c     OPV.c           OPB.c      OPP.c    || exit /b
 
-cl -nologo /Zi Vishap.c /Fe%ROOTDIR%\%VISHAP% ^
+cl -nologo /Zi Compiler.c /Fe%ROOTDIR%\%OBECOMP% /link /INCREMENTAL:NO ^
 SYSTEM.obj Configuration.obj Platform.obj Heap.obj ^
-Console.obj Strings.obj Modules.obj Files.obj ^
-Reals.obj Texts.obj vt100.obj errors.obj ^
+Out.obj Strings.obj Modules.obj Files.obj ^
+Reals.obj Texts.obj VT100.obj errors.obj ^
 OPM.obj extTools.obj OPS.obj OPT.obj ^
 OPC.obj OPV.obj OPB.obj OPP.obj || exit /b
 
-echo.%VISHAP% created.
+copy src\runtime\*.c %BUILDDIR% >nul
+copy src\runtime\*.h %BUILDDIR% >nul
+echo.%OBECOMP% created.
 cd %ROOTDIR%
 goto :eof
 
@@ -145,7 +140,11 @@ goto :eof
 echo.Populating clean build directory from bootstrap C sources.
 mkdir %BUILDDIR% >nul 2>nul
 copy bootstrap\%PLATFORM%-%ADRSIZE%%ALIGNMENT%\*.* %BUILDDIR% >nul
+copy bootstrap\*.c %BUILDDIR% >nul
+copy bootstrap\*.h %BUILDDIR% >nul
 call :assemble || exit /b
+copy bootstrap\*.c %BUILDDIR% >nul
+copy bootstrap\*.h %BUILDDIR% >nul
 goto :eof
 
 
@@ -154,40 +153,39 @@ goto :eof
 :translate
 :: Make sure we have an oberon compiler binary: if we built one earlier we'll use it,
 :: otherwise use one of the saved sets of C sources in the bootstrap directory.
-if not exist %VISHAP% call :compilefromsavedsource
+if not exist %OBECOMP% call :compilefromsavedsource
 
 echo.
 echo.make translate - translating compiler source:
 echo.  PLATFORM:  %PLATFORM%
-echo.  INTSIZE:   %INTSIZE%
+echo.  MODEL:     %MODEL%
 echo.  ADRSIZE:   %ADRSIZE%
 echo.  ALIGNMENT: %ALIGNMENT%
 
 md %BUILDDIR% 2>nul
 cd %BUILDDIR%
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../Configuration.Mod                 || exit /b
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/system/Platform%PLATFORM%.Mod || exit /b
-%ROOTDIR%\%VISHAP% -SFsapx -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/system/Heap.Mod               || exit /b
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/system/Console.Mod            || exit /b
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/library/v4/Strings.Mod        || exit /b
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/library/v4/Modules.Mod        || exit /b
-%ROOTDIR%\%VISHAP% -SFsx   -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/system/Files.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/library/v4/Reals.Mod          || exit /b
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/library/v4/Texts.Mod          || exit /b
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/library/misc/vt100.Mod        || exit /b
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/compiler/errors.Mod           || exit /b
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/compiler/OPM.cmdln.Mod        || exit /b
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/compiler/extTools.Mod         || exit /b
-%ROOTDIR%\%VISHAP% -SFsx   -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/compiler/OPS.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/compiler/OPT.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/compiler/OPC.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/compiler/OPV.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/compiler/OPB.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -SFs    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/compiler/OPP.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -Ssm    -B%INTSIZE%%ADRSIZE%%ALIGNMENT%  ../../src/compiler/Vishap.Mod           || exit /b
+del *.sym >nul 2>nul
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../Configuration.Mod                  || exit /b
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/runtime/Platform%PLATFORM%.Mod || exit /b
+%ROOTDIR%\%OBECOMP% -SsfFapx -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/runtime/Heap.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/runtime/Strings.Mod            || exit /b
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/runtime/Out.Mod                || exit /b
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/runtime/Modules.Mod            || exit /b
+%ROOTDIR%\%OBECOMP% -SsfFx   -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/runtime/Files.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/runtime/Reals.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/runtime/Texts.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/runtime/VT100.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/compiler/errors.Mod            || exit /b
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/compiler/OPM.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/compiler/extTools.Mod          || exit /b
+%ROOTDIR%\%OBECOMP% -SsfFx   -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/compiler/OPS.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/compiler/OPT.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/compiler/OPC.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/compiler/OPV.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/compiler/OPB.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -SsfF    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/compiler/OPP.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -Ssfm    -A%ADRSIZE%%ALIGNMENT% -O%MODEL% ../../src/compiler/Compiler.Mod          || exit /b
 cd %ROOTDIR%
-copy src\system\*.c %BUILDDIR% >nul
-copy src\system\*.h %BUILDDIR% >nul
 echo.%BUILDDIR% filled with compiler C source.
 goto :eof
 
@@ -198,10 +196,10 @@ goto :eof
 echo.
 echo.Making symbol browser
 cd %BUILDDIR%
-%ROOTDIR%/%VISHAP% -Sm ../../src/tools/browser/BrowserCmd.Mod
+%ROOTDIR%/%OBECOMP% -fSm ../../src/tools/browser/BrowserCmd.Mod
 cl -nologo BrowserCmd.c /Feshowdef.exe ^
-  Platform.obj Texts.obj OPT.obj Heap.obj Console.obj SYSTEM.obj OPM.obj OPS.obj OPV.obj ^
-  Files.obj Reals.obj Modules.obj vt100.obj errors.obj Configuration.obj Strings.obj ^
+  Platform.obj Texts.obj OPT.obj Heap.obj Out.obj SYSTEM.obj OPM.obj OPS.obj OPV.obj ^
+  Files.obj Reals.obj Modules.obj VT100.obj errors.obj Configuration.obj Strings.obj ^
   OPC.obj
 cd %ROOTDIR%
 goto :eof
@@ -215,19 +213,28 @@ if errorlevel 1 (
 echo make install - administrator rights required. Please run under an administrator command prompt.
 goto :eof
 )
-rmdir /s /q "%INSTALLDIR%"                            >nul 2>&1
-mkdir "%INSTALLDIR%"                                  >nul 2>&1
-mkdir "%INSTALLDIR%\bin"                              >nul 2>&1
-mkdir "%INSTALLDIR%\include"                          >nul 2>&1
-mkdir "%INSTALLDIR%\sym"                              >nul 2>&1
-mkdir "%INSTALLDIR%\lib"                              >nul 2>&1
-copy %BUILDDIR%\*.h            "%INSTALLDIR%\include" >nul
-copy %BUILDDIR%\*.sym          "%INSTALLDIR%\sym"     >nul
-copy %VISHAP%                  "%INSTALLDIR%\bin"     >nul
-copy %BUILDDIR%\showdef.exe    "%INSTALLDIR%\bin"     >nul
-copy %BUILDDIR%\lib%ONAME%.lib "%INSTALLDIR%\lib"     >nul
-echo.
-echo.Now add "%INSTALLDIR%\bin" to your path.
+rmdir /s /q "%INSTALLDIR%"                        >nul 2>&1
+mkdir "%INSTALLDIR%"                              >nul 2>&1
+
+mkdir "%INSTALLDIR%\bin"                          >nul 2>&1
+copy %OBECOMP%              "%INSTALLDIR%\bin"    >nul
+copy %BUILDDIR%\showdef.exe "%INSTALLDIR%\bin"    >nul
+
+mkdir "%INSTALLDIR%\2"                            >nul 2>&1
+mkdir "%INSTALLDIR%\2\include"                    >nul 2>&1
+mkdir "%INSTALLDIR%\2\sym"                        >nul 2>&1
+copy %BUILDDIR%\2\*.h    "%INSTALLDIR%\2\include" >nul
+copy %BUILDDIR%\2\*.sym  "%INSTALLDIR%\2\sym"     >nul
+
+mkdir "%INSTALLDIR%\C"                            >nul 2>&1
+mkdir "%INSTALLDIR%\C\include"                    >nul 2>&1
+mkdir "%INSTALLDIR%\C\sym"                        >nul 2>&1
+copy %BUILDDIR%\C\*.h    "%INSTALLDIR%\C\include" >nul
+copy %BUILDDIR%\C\*.sym  "%INSTALLDIR%\C\sym"     >nul
+
+mkdir "%INSTALLDIR%\lib"                          >nul 2>&1
+copy %BUILDDIR%\2\lib%ONAME%* "%INSTALLDIR%\lib"  >nul
+copy %BUILDDIR%\C\lib%ONAME%* "%INSTALLDIR%\lib"  >nul
 goto :eof
 
 
@@ -241,65 +248,93 @@ rmdir /s /q "%INSTALLDIR%" >nul 2>&1
 goto :eof
 
 
+:showpath
+echo.
+echo Now add %INSTALLDIR%\bin to your path, for example with the command:
+echo PATH %INSTALLDIR%\bin;%%PATH%%
+echo.
+goto :eof
+
+
+:runtime
+echo.
+echo.Making runtime library for -O%MODEL%
+cd %BUILDDIR%\%MODEL%
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/runtime/Platform%PLATFORM%.Mod
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/runtime/Heap.Mod
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/runtime/Modules.Mod
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/runtime/Strings.Mod
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/runtime/Out.Mod
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/runtime/In.Mod
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/runtime/VT100.Mod
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/runtime/Files.Mod
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/runtime/Math.Mod
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/runtime/MathL.Mod
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/runtime/Reals.Mod
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/runtime/Texts.Mod
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/runtime/Oberon.Mod
+cd %ROOTDIR%
+goto :eof
 
 
 :v4
 echo.
-echo.Making V4 library
-cd %BUILDDIR%
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/v4/Args.Mod                      || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/v4/Printer.Mod                   || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/v4/Sets.Mod                      || exit /b
+echo.Making V4 library for -O%MODEL%
+cd %BUILDDIR%\%MODEL%
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/v4/Args.Mod                      || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/v4/Console.Mod                   || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/v4/Printer.Mod                   || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/v4/Sets.Mod                      || exit /b
 cd %ROOTDIR%
 goto :eof
 
 :ooc2
-echo.Making ooc2 library
-cd %BUILDDIR%
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc2/ooc2Strings.Mod             || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc2/ooc2Ascii.Mod               || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc2/ooc2CharClass.Mod           || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc2/ooc2ConvTypes.Mod           || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc2/ooc2IntConv.Mod             || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc2/ooc2IntStr.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc2/ooc2Real0.Mod               || exit /b
+echo.Making ooc2 library for -O%MODEL%
+cd %BUILDDIR%\%MODEL%
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc2/ooc2Strings.Mod             || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc2/ooc2Ascii.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc2/ooc2CharClass.Mod           || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc2/ooc2ConvTypes.Mod           || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc2/ooc2IntConv.Mod             || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc2/ooc2IntStr.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc2/ooc2Real0.Mod               || exit /b
 cd %ROOTDIR%
 goto :eof
 
 :ooc
-echo.Making ooc library
-cd %BUILDDIR%
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocLowReal.Mod               || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocLowLReal.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocRealMath.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocOakMath.Mod               || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocLRealMath.Mod             || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocLongInts.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocComplexMath.Mod           || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocLComplexMath.Mod          || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocAscii.Mod                 || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocCharClass.Mod             || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocStrings.Mod               || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocConvTypes.Mod             || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocLRealConv.Mod             || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocLRealStr.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocRealConv.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocRealStr.Mod               || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocIntConv.Mod               || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocIntStr.Mod                || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocMsg.Mod                   || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocSysClock.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocTime.Mod                  || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocChannel.Mod               || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocStrings2.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocRts.Mod                   || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocFilenames.Mod             || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocTextRider.Mod             || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocBinaryRider.Mod           || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocJulianDay.Mod             || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocFilenames.Mod             || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocwrapperlibc.Mod           || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ooc/oocC%DATAMODEL%.Mod          || exit /b
+echo.Making ooc library for -O%MODEL%
+cd %BUILDDIR%\%MODEL%
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocLowReal.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocLowLReal.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocRealMath.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocOakMath.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocLRealMath.Mod             || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocLongInts.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocComplexMath.Mod           || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocLComplexMath.Mod          || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocAscii.Mod                 || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocCharClass.Mod             || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocStrings.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocConvTypes.Mod             || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocLRealConv.Mod             || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocLRealStr.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocRealConv.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocRealStr.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocIntConv.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocIntStr.Mod                || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocMsg.Mod                   || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocSysClock.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocTime.Mod                  || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocChannel.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocStrings2.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocRts.Mod                   || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocFilenames.Mod             || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocTextRider.Mod             || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocBinaryRider.Mod           || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocJulianDay.Mod             || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocFilenames.Mod             || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocwrapperlibc.Mod           || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ooc/oocC%DATAMODEL%.Mod          || exit /b
 cd %ROOTDIR%
 goto :eof
 
@@ -308,117 +343,138 @@ echo No X11 support on plain Windows - use cygwin and build with cygwin make.
 goto :eof
 
 :ulm
-echo.Making ulm library
-cd %BUILDDIR%
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmObjects.Mod               || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmPriorities.Mod            || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmDisciplines.Mod           || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmServices.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmSys.Mod                   || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmSYSTEM.Mod                || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmEvents.Mod                || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmProcess.Mod               || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmResources.Mod             || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmForwarders.Mod            || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmRelatedEvents.Mod         || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmTypes.Mod                 || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmStreams.Mod               || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmStrings.Mod               || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmSysTypes.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmTexts.Mod                 || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmSysConversions.Mod        || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmErrors.Mod                || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmSysErrors.Mod             || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmSysStat.Mod               || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmASCII.Mod                 || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmSets.Mod                  || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmIO.Mod                    || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmAssertions.Mod            || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmIndirectDisciplines.Mod   || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmStreamDisciplines.Mod     || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmIEEE.Mod                  || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmMC68881.Mod               || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmReals.Mod                 || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmPrint.Mod                 || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmWrite.Mod                 || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmConstStrings.Mod          || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmPlotters.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmSysIO.Mod                 || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmLoader.Mod                || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmNetIO.Mod                 || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmPersistentObjects.Mod     || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmPersistentDisciplines.Mod || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmOperations.Mod            || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmScales.Mod                || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmTimes.Mod                 || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmClocks.Mod                || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmTimers.Mod                || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmConditions.Mod            || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmStreamConditions.Mod      || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmTimeConditions.Mod        || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmCiphers.Mod               || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmCipherOps.Mod             || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmBlockCiphers.Mod          || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmAsymmetricCiphers.Mod     || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmConclusions.Mod           || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmRandomGenerators.Mod      || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmTCrypt.Mod                || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/ulm/ulmIntOperations.Mod         || exit /b
+echo.Making ulm library for -O%MODEL%
+cd %BUILDDIR%\%MODEL%
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmObjects.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmPriorities.Mod            || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmDisciplines.Mod           || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmServices.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmSys.Mod                   || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmSYSTEM.Mod                || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmEvents.Mod                || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmProcess.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmResources.Mod             || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmForwarders.Mod            || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmRelatedEvents.Mod         || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmTypes.Mod                 || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmStreams.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmStrings.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmSysTypes.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmTexts.Mod                 || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmSysConversions.Mod        || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmErrors.Mod                || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmSysErrors.Mod             || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmSysStat.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmASCII.Mod                 || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmSets.Mod                  || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmIO.Mod                    || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmAssertions.Mod            || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmIndirectDisciplines.Mod   || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmStreamDisciplines.Mod     || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmIEEE.Mod                  || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmMC68881.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmReals.Mod                 || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmPrint.Mod                 || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmWrite.Mod                 || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmConstStrings.Mod          || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmPlotters.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmSysIO.Mod                 || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmLoader.Mod                || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmNetIO.Mod                 || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmPersistentObjects.Mod     || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmPersistentDisciplines.Mod || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmOperations.Mod            || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmScales.Mod                || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmTimes.Mod                 || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmClocks.Mod                || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmTimers.Mod                || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmConditions.Mod            || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmStreamConditions.Mod      || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmTimeConditions.Mod        || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmCiphers.Mod               || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmCipherOps.Mod             || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmBlockCiphers.Mod          || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmAsymmetricCiphers.Mod     || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmConclusions.Mod           || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmRandomGenerators.Mod      || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmTCrypt.Mod                || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/ulm/ulmIntOperations.Mod         || exit /b
 cd %ROOTDIR%
 goto :eof
 
 :pow32
-echo.Making pow32 library
-cd %BUILDDIR%
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/pow/powStrings.Mod               || exit /b
+echo.Making pow32 library for -O%MODEL%
+cd %BUILDDIR%\%MODEL%
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/pow/powStrings.Mod               || exit /b
 cd %ROOTDIR%
 goto :eof
 
 :misc
-echo.Making misc library
-cd %BUILDDIR%
-%ROOTDIR%\%VISHAP% -Fs ../../src/system/Oberon.Mod                        || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/misc/crt.Mod                     || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/misc/Listen.Mod                  || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/misc/MersenneTwister.Mod         || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/misc/MultiArrays.Mod             || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/misc/MultiArrayRiders.Mod        || exit /b
+echo.Making misc library for -O%MODEL%
+cd %BUILDDIR%\%MODEL%
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/misc/crt.Mod                     || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/misc/Listen.Mod                  || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/misc/MersenneTwister.Mod         || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/misc/MultiArrays.Mod             || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/misc/MultiArrayRiders.Mod        || exit /b
 cd %ROOTDIR%
 goto :eof
 
 :s3
-echo.Making s3 library
-cd %BUILDDIR%
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethBTrees.Mod                 || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethMD5.Mod                    || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethSets.Mod                   || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethZlib.Mod                   || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethZlibBuffers.Mod            || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethZlibInflate.Mod            || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethZlibDeflate.Mod            || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethZlibReaders.Mod            || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethZlibWriters.Mod            || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethZip.Mod                    || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethRandomNumbers.Mod          || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethGZReaders.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethGZWriters.Mod              || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethUnicode.Mod                || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethDates.Mod                  || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethReals.Mod                  || exit /b
-%ROOTDIR%\%VISHAP% -Fs ../../src/library/s3/ethStrings.Mod                || exit /b
+echo.Making s3 library for -O%MODEL%
+cd %BUILDDIR%\%MODEL%
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethBTrees.Mod                 || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethMD5.Mod                    || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethSets.Mod                   || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethZlib.Mod                   || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethZlibBuffers.Mod            || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethZlibInflate.Mod            || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethZlibDeflate.Mod            || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethZlibReaders.Mod            || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethZlibWriters.Mod            || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethZip.Mod                    || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethRandomNumbers.Mod          || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethGZReaders.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethGZWriters.Mod              || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethUnicode.Mod                || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethDates.Mod                  || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethReals.Mod                  || exit /b
+%ROOTDIR%\%OBECOMP% -Ffs -O%MODEL% ../../../src/library/s3/ethStrings.Mod                || exit /b
 cd %ROOTDIR%
 goto :eof
 
 
 
 
-:librarybinary
-echo.
-echo.Making lib%ONAME%
-:: Remove objects that should not be part of the library
-del /q %BUILDDIR%\Vishap.obj
-:: Make static library
-lib -nologo %BUILDDIR%\*.obj -out:%BUILDDIR%\lib%ONAME%.lib || exit /b
+:initlibrary
+del /s /q %BUILDDIR%\%MODEL% >nul 2>nul
+mkdir %BUILDDIR%             >nul 2>nul
+mkdir %BUILDDIR%\%MODEL%     >nul 2>nul
+copy src\runtime\*.c %BUILDDIR%\%MODEL% >nul
+copy src\runtime\*.h %BUILDDIR%\%MODEL% >nul
+cd %BUILDDIR%\%MODEL%
+cl -nologo -c SYSTEM.c
+cd %ROOTDIR%
+goto :eof
+
+
+:library
+SET MODEL=2
+call :initlibrary   || exit /b
+call :runtime       || exit /b
+call :v4            || exit /b
+call :ooc2          || exit /b
+call :ooc           || exit /b
+call :ulm           || exit /b
+call :pow32         || exit /b
+call :misc          || exit /b
+call :s3            || exit /b
+lib -nologo %BUILDDIR%\%MODEL%\*.obj -out:%BUILDDIR%\%MODEL%\lib%ONAME%-O%MODEL%.lib || exit /b
+
+SET MODEL=C
+call :initlibrary   || exit /b
+call :runtime       || exit /b
+lib -nologo %BUILDDIR%\%MODEL%\*.obj -out:%BUILDDIR%\%MODEL%\lib%ONAME%-O%MODEL%.lib || exit /b
 goto :eof
 
 
@@ -427,3 +483,4 @@ goto :eof
 
 
 
+
diff --git a/src/compiler/extTools.Mod b/src/compiler/extTools.Mod
index 062e8014..8c84ecae 100644
--- a/src/compiler/extTools.Mod
+++ b/src/compiler/extTools.Mod
@@ -72,6 +72,7 @@ PROCEDURE LinkMain*(VAR moduleName: ARRAY OF CHAR; statically: BOOLEAN; addition
     Strings.Append(Configuration.libspec,      cmd);
     Strings.Append('-O',                       cmd);
     Strings.Append(OPM.Model,                  cmd);
+    Strings.Append(Configuration.libext,       cmd);
     execute("Assemble and link: ", cmd);
   END LinkMain;
 
diff --git a/src/runtime/SYSTEM.h b/src/runtime/SYSTEM.h
index fb88276c..3f3b6133 100644
--- a/src/runtime/SYSTEM.h
+++ b/src/runtime/SYSTEM.h
@@ -26,6 +26,9 @@
 #define _SIZE_T_DEFINED_ // For OpenBSD
 
 void *memcpy(void *dest, const void *source, size_t size);
+#if defined _WIN32
+#define alloca _alloca
+#endif
 void *alloca(size_t size);
 
 
diff --git a/src/tools/make/configure.c b/src/tools/make/configure.c
index 183d1966..13ea087a 100644
--- a/src/tools/make/configure.c
+++ b/src/tools/make/configure.c
@@ -54,6 +54,7 @@ char *version   = macrotostring(O_VER);
 char *objext    = ".o";
 char *objflag   = " -o ";
 char *linkflags = " -L\"";
+char *libext    = "";
 char *oname     = NULL;  // From O_NAME env var if present, or O_NAME macro otherwise.
 
 
@@ -154,7 +155,8 @@ void determineCCompiler() {
     objext    = ".obj";
     objflag   = " -Fe";
     linkflags = " -link -libpath:\"";
-    snprintf(libspec, sizeof(libspec), " lib%s.lib", oname);
+    snprintf(libspec, sizeof(libspec), " lib%s", oname);
+    libext    = ".lib";
   #else
     fail("Unrecognised C compiler.");
   #endif
@@ -412,6 +414,7 @@ void writeConfigurationMod() {
   fprintf(fd, "  objflag*     = '%s';\n", objflag);
   fprintf(fd, "  linkflags*   = '%s';\n", linkflags);
   fprintf(fd, "  libspec*     = '%s';\n", libspec);
+  fprintf(fd, "  libext*      = '%s';\n", libext);
   fprintf(fd, "  compile*     = '%s';\n", cc);
   fprintf(fd, "  installdir*  = '%s';\n", installdir);
   fprintf(fd, "  staticLink*  = '%s';\n", staticlink);
diff --git a/src/tools/make/oberon.mk b/src/tools/make/oberon.mk
index c67dfe10..e5fde295 100644
--- a/src/tools/make/oberon.mk
+++ b/src/tools/make/oberon.mk
@@ -254,6 +254,7 @@ ooc:
 	cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocTextRider.Mod
 	cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocBinaryRider.Mod
 	cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocJulianDay.Mod
+	cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocFilenames.Mod
 	cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocwrapperlibc.Mod
 	cd $(BUILDDIR)/$(MODEL); $(ROOTDIR)/$(OBECOMP) -Ffs -O$(MODEL) ../../../src/library/ooc/oocC$(DATAMODEL).Mod