diff --git a/build/li0.vcxproj b/build/li0.vcxproj
index 2a010df53..bbbff614d 100644
--- a/build/li0.vcxproj
+++ b/build/li0.vcxproj
@@ -43,7 +43,7 @@
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exe\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\$(SolutionName)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\exe\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\obj\$(SolutionName)\$(ProjectName)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
@@ -70,10 +70,9 @@
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <StringPooling>true</StringPooling>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
@@ -95,6 +94,7 @@
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
       <ShowProgress>NotSet</ShowProgress>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -179,6 +179,8 @@
     <ClCompile Include="..\src\li\li0300.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <MskCompiler Include="..\src\li\li0100a.uml" />
+    <MskCompiler Include="..\src\li\li0200a.uml" />
     <MskCompiler Include="..\src\li\li0400a.uml" />
     <MskCompiler Include="..\src\li\li0500a.uml" />
     <MskCompiler Include="..\src\li\li0500b.uml" />
@@ -237,16 +239,12 @@
     <ProjectReference Include="lilib.vcxproj">
       <Project>{c575788b-0be4-4f68-b9c9-3c204ec04e07}</Project>
     </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <MskCompiler Include="..\src\li\li0200a.msk">
-      <FileType>Document</FileType>
-    </MskCompiler>
-  </ItemGroup>
-  <ItemGroup>
-    <MskCompiler Include="..\src\li\li0100a.msk">
-      <FileType>Document</FileType>
-    </MskCompiler>
+    <ProjectReference Include="vedoc.vcxproj">
+      <Project>{a1ce9743-a597-4f92-b55a-345a366c9e55}</Project>
+    </ProjectReference>
+    <ProjectReference Include="vedocext.vcxproj">
+      <Project>{0042619a-6b7c-4d3d-9cd9-9bdd8d200c15}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/li0.vcxproj.filters b/build/li0.vcxproj.filters
index dff1c4e74..99c55a6c1 100644
--- a/build/li0.vcxproj.filters
+++ b/build/li0.vcxproj.filters
@@ -75,10 +75,10 @@
     <MskCompiler Include="..\src\li\li0300a.uml">
       <Filter>Masks</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\src\li\li0200a.msk">
+    <MskCompiler Include="..\src\li\li0100a.uml">
       <Filter>Masks</Filter>
     </MskCompiler>
-    <MskCompiler Include="..\src\li\li0100a.msk">
+    <MskCompiler Include="..\src\li\li0200a.uml">
       <Filter>Masks</Filter>
     </MskCompiler>
   </ItemGroup>
diff --git a/build/vedocext.vcxproj b/build/vedocext.vcxproj
index 6a7716d91..64318e89e 100644
--- a/build/vedocext.vcxproj
+++ b/build/vedocext.vcxproj
@@ -105,12 +105,12 @@
   <ItemGroup>
     <ClCompile Include="..\src\ca\calib01.cpp" />
     <ClCompile Include="..\src\ca\calib02.cpp" />
-    <ClCompile Include="..\src\cg\cg2101.cpp" />
     <ClCompile Include="..\src\cg\cglib02.cpp" />
+    <ClCompile Include="..\src\cg\cglib03.cpp" />
+    <ClCompile Include="..\src\cg\cglib06.cpp" />
     <ClCompile Include="..\src\cg\cgsaldac.cpp" />
     <ClCompile Include="..\src\ef\ef0101.cpp" />
     <ClCompile Include="..\src\in\inlib01.cpp" />
-    <ClCompile Include="..\src\ve\velib04.cpp" />
     <ClCompile Include="..\src\ve\velib04a.cpp" />
     <ClCompile Include="..\src\ve\velib04b.cpp" />
     <ClCompile Include="..\src\ve\velib04c.cpp" />
diff --git a/build/vedocext.vcxproj.filters b/build/vedocext.vcxproj.filters
index e6d6fc142..f6b1c89af 100644
--- a/build/vedocext.vcxproj.filters
+++ b/build/vedocext.vcxproj.filters
@@ -17,18 +17,6 @@
     <ClCompile Include="..\src\ca\calib02.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\cg\cg2101.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cg\cglib02.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cg\cgsaldac.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\ve\velib04.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\ve\velib04a.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -62,6 +50,18 @@
     <ClCompile Include="..\src\in\inlib01.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\cg\cglib06.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cg\cglib02.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cg\cglib03.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\cg\cgsaldac.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\ve\velib.h">