diff --git a/SAX/ParserConfig.tpl b/SAX/ParserConfig.tpl
index a8bfbcb7..ebe1499c 100644
--- a/SAX/ParserConfig.tpl
+++ b/SAX/ParserConfig.tpl
@@ -50,7 +50,7 @@ include <SAX/wrappers/saxexpat.h>
 undef DEF_SAX_P
 define DEF_SAX_P expat_wrapper
 #ifdef _MSC_VER
-comment(lib, "expat.lib")
+comment(lib, "libexpat.lib")
 #endif
 #endif
 
diff --git a/SAX/SAX.dsp b/SAX/SAX.dsp
index 8f743905..b757525a 100644
--- a/SAX/SAX.dsp
+++ b/SAX/SAX.dsp
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\\" /I "\work\include" /I "\work\lib" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "USE_XERCES" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -328,8 +328,8 @@ SOURCE=.\ParserConfig.tpl
 InputPath=.\ParserConfig.tpl
 
 BuildCmds= \
-	cl /TC /D USE_MSXML /EP ParserConfig.tpl > ParserConfig.h \
-	cl /TC /D USE_MSXML /EP saxlib.tpl > saxlib.cpp \
+	cl /TC /D USE_EXPAT /EP ParserConfig.tpl > ParserConfig.h \
+	cl /TC /D USE_EXPAT /EP saxlib.tpl > saxlib.cpp \
 	
 
 "ParserConfig.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
diff --git a/examples/SAX/SimpleHandler.dsp b/examples/SAX/SimpleHandler.dsp
index 6cb96ea2..70dcacb3 100644
--- a/examples/SAX/SimpleHandler.dsp
+++ b/examples/SAX/SimpleHandler.dsp
@@ -65,7 +65,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/examples/SAX/SimpleHandler.mak b/examples/SAX/SimpleHandler.mak
index 9e85df66..4aa224ff 100644
--- a/examples/SAX/SimpleHandler.mak
+++ b/examples/SAX/SimpleHandler.mak
@@ -120,7 +120,7 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP_PROJ=/nologo /MLd /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\SimpleHandler.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MLd /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\SimpleHandler.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\SimpleHandler.bsc" 
 BSC32_SBRS= \
diff --git a/examples/SAX/Writer.dsp b/examples/SAX/Writer.dsp
index 8535a3b6..cc6495c7 100644
--- a/examples/SAX/Writer.dsp
+++ b/examples/SAX/Writer.dsp
@@ -65,7 +65,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/examples/SAX/pyx.dsp b/examples/SAX/pyx.dsp
index f94924f5..8fea67b8 100644
--- a/examples/SAX/pyx.dsp
+++ b/examples/SAX/pyx.dsp
@@ -65,8 +65,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_MSXML" /YX /FD /GZ /c
-# SUBTRACT CPP /Fr
+# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/examples/SAX/pyx.mak b/examples/SAX/pyx.mak
index 0982d957..6c1e0e24 100644
--- a/examples/SAX/pyx.mak
+++ b/examples/SAX/pyx.mak
@@ -36,10 +36,21 @@ INTDIR=.\Release
 OutDir=.\..\bin
 # End Custom Macros
 
+!IF "$(RECURSE)" == "0" 
+
 ALL : "$(OUTDIR)\pyx.exe"
 
+!ELSE 
 
+ALL : "SAXlib - Win32 Release" "$(OUTDIR)\pyx.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"SAXlib - Win32 ReleaseCLEAN" 
+!ELSE 
 CLEAN :
+!ENDIF 
 	-@erase "$(INTDIR)\pyx.obj"
 	-@erase "$(INTDIR)\vc60.idb"
 	-@erase "$(OUTDIR)\pyx.exe"
@@ -60,8 +71,7 @@ LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi3
 LINK32_OBJS= \
 	"$(INTDIR)\pyx.obj" \
 	"..\..\lib\SAX.lib" \
-	"..\..\..\..\lib\vc6\expat.lib" \
-	"..\..\lib\Utilities.lib"
+	"..\..\SAX\Release\SAX.lib"
 
 "$(OUTDIR)\pyx.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -76,10 +86,21 @@ INTDIR=.\pyx___Win32_Debug
 OutDir=.\..\..\bin
 # End Custom Macros
 
+!IF "$(RECURSE)" == "0" 
+
 ALL : "$(OUTDIR)\pyx.exe"
 
+!ELSE 
 
+ALL : "SAXlib - Win32 Debug" "$(OUTDIR)\pyx.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"SAXlib - Win32 DebugCLEAN" 
+!ELSE 
 CLEAN :
+!ENDIF 
 	-@erase "$(INTDIR)\pyx.obj"
 	-@erase "$(INTDIR)\vc60.idb"
 	-@erase "$(INTDIR)\vc60.pdb"
@@ -93,18 +114,16 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP_PROJ=/nologo /MLd /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\pyx.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MLd /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\pyx.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\pyx.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pyx.pdb" /debug /machine:I386 /out:"$(OUTDIR)\pyx.exe" /pdbtype:sept 
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\pyx.pdb" /debug /machine:I386 /out:"$(OUTDIR)\pyx.exe" /pdbtype:sept /libpath:"..\..\lib" /libpath:"\work\lib\vc6" 
 LINK32_OBJS= \
 	"$(INTDIR)\pyx.obj" \
-	"..\..\lib\SAX.lib" \
-	"..\..\..\..\lib\vc6\expat.lib" \
-	"..\..\lib\Utilities.lib"
+	"..\..\lib\SAX.lib"
 
 "$(OUTDIR)\pyx.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -159,6 +178,32 @@ SOURCE=.\pyx.cpp
 "$(INTDIR)\pyx.obj" : $(SOURCE) "$(INTDIR)"
 
 
+!IF  "$(CFG)" == "pyx - Win32 Release"
+
+"SAXlib - Win32 Release" : 
+   cd "\work\JezUK\Arabica\src\SAX"
+   $(MAKE) /$(MAKEFLAGS) /F .\SAX.mak CFG="SAXlib - Win32 Release" 
+   cd "..\examples\SAX"
+
+"SAXlib - Win32 ReleaseCLEAN" : 
+   cd "\work\JezUK\Arabica\src\SAX"
+   $(MAKE) /$(MAKEFLAGS) /F .\SAX.mak CFG="SAXlib - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\examples\SAX"
+
+!ELSEIF  "$(CFG)" == "pyx - Win32 Debug"
+
+"SAXlib - Win32 Debug" : 
+   cd "\work\JezUK\Arabica\src\SAX"
+   $(MAKE) /$(MAKEFLAGS) /F .\SAX.mak CFG="SAXlib - Win32 Debug" 
+   cd "..\examples\SAX"
+
+"SAXlib - Win32 DebugCLEAN" : 
+   cd "\work\JezUK\Arabica\src\SAX"
+   $(MAKE) /$(MAKEFLAGS) /F .\SAX.mak CFG="SAXlib - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\examples\SAX"
+
+!ENDIF 
+
 
 !ENDIF 
 
diff --git a/examples/SAX2DOM/SAX2DOM_test.dsp b/examples/SAX2DOM/SAX2DOM_test.dsp
index a4f68517..adc48831 100644
--- a/examples/SAX2DOM/SAX2DOM_test.dsp
+++ b/examples/SAX2DOM/SAX2DOM_test.dsp
@@ -65,7 +65,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_EXPAT" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/examples/SAX2DOM/SAX2DOM_test.mak b/examples/SAX2DOM/SAX2DOM_test.mak
index 2ae83d23..c000c9ff 100644
--- a/examples/SAX2DOM/SAX2DOM_test.mak
+++ b/examples/SAX2DOM/SAX2DOM_test.mak
@@ -88,6 +88,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\test_DOMImplementation.obj" \
 	"$(INTDIR)\test_Element.obj" \
 	"$(INTDIR)\test_ProcessingInstruction.obj" \
+	"$(INTDIR)\test_SAX.obj" \
 	"$(INTDIR)\test_Siblings.obj" \
 	"$(INTDIR)\TestCase.obj" \
 	"$(INTDIR)\TestFailure.obj" \
@@ -96,7 +97,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\TextTestResult.obj" \
 	"..\..\lib\SAX.lib" \
 	"..\..\lib\Utilities.lib" \
-	"$(INTDIR)\test_SAX.obj" \
 	"..\..\SAX\Release\SAX.lib"
 
 "$(OUTDIR)\SAX2DOM_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -154,7 +154,7 @@ CLEAN :
 "$(INTDIR)" :
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
-CPP_PROJ=/nologo /MLd /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_EXPAT" /Fp"$(INTDIR)\SAX2DOM_test.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+CPP_PROJ=/nologo /MLd /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\SAX2DOM_test.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\SAX2DOM_test.bsc" 
 BSC32_SBRS= \
@@ -170,6 +170,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\test_DOMImplementation.obj" \
 	"$(INTDIR)\test_Element.obj" \
 	"$(INTDIR)\test_ProcessingInstruction.obj" \
+	"$(INTDIR)\test_SAX.obj" \
 	"$(INTDIR)\test_Siblings.obj" \
 	"$(INTDIR)\TestCase.obj" \
 	"$(INTDIR)\TestFailure.obj" \
@@ -177,8 +178,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\TestSuite.obj" \
 	"$(INTDIR)\TextTestResult.obj" \
 	"..\..\lib\SAX.lib" \
-	"..\..\lib\Utilities.lib" \
-	"$(INTDIR)\test_SAX.obj"
+	"..\..\lib\Utilities.lib"
 
 "$(OUTDIR)\SAX2DOM_test.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<