diff --git a/build/tf.sln b/build/tf.sln
index a80e16d27..08f7d93ad 100644
--- a/build/tf.sln
+++ b/build/tf.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.106
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32126.317
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tf0", "tf0.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -21,6 +21,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tflib", "tflib.vcxproj", "{
 		{C575788B-0BE4-4F68-B9C9-3C204EC04E07} = {C575788B-0BE4-4F68-B9C9-3C204EC04E07}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -51,6 +53,10 @@ Global
 		{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}.Debug|Win32.Build.0 = Debug|Win32
 		{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}.Release|Win32.ActiveCfg = Release|Win32
 		{7BF6939E-DFCD-49ED-B0A8-EDB68DDCE6D5}.Release|Win32.Build.0 = Release|Win32
+		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32
+		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32
+		{7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/build/tf0.vcxproj b/build/tf0.vcxproj
index 31a2c3789..677576659 100644
--- a/build/tf0.vcxproj
+++ b/build/tf0.vcxproj
@@ -41,10 +41,10 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exe\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\exe</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\obj\$(SolutionName)\$(ProjectName)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\exe\</OutDir>
+    <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>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
@@ -83,7 +83,7 @@
       <AdditionalIncludeDirectories>..\wx28X\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -93,6 +93,7 @@
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -134,9 +135,11 @@
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
-      <Version>12.0</Version>
+      <Version>
+      </Version>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -175,6 +178,9 @@
     <ProjectReference Include="AgaLib.vcxproj">
       <Project>{2d38a763-3d74-4338-9362-b891784ec90e}</Project>
     </ProjectReference>
+    <ProjectReference Include="cglib.vcxproj">
+      <Project>{7b80f974-ce2e-4bd9-855a-44ff139ff288}</Project>
+    </ProjectReference>
     <ProjectReference Include="tflib.vcxproj">
       <Project>{7bf6939e-dfcd-49ed-b0a8-edb68ddce6d5}</Project>
     </ProjectReference>
@@ -196,8 +202,6 @@
     <ClInclude Include="..\src\tf\tftbcon.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\cg\cglib01.cpp" />
-    <ClCompile Include="..\src\cg\cglib03.cpp" />
     <ClCompile Include="..\src\fe\felib.cpp" />
     <ClCompile Include="..\src\tf\tf0.cpp" />
     <ClCompile Include="..\src\tf\tf0100.cpp" />
diff --git a/build/tf0.vcxproj.filters b/build/tf0.vcxproj.filters
index c0aeaf30e..57626e781 100644
--- a/build/tf0.vcxproj.filters
+++ b/build/tf0.vcxproj.filters
@@ -71,12 +71,6 @@
     <ClCompile Include="..\src\tf\tf0300.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\cg\cglib01.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\cg\cglib03.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\fe\felib.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
diff --git a/src/include/relation.cpp b/src/include/relation.cpp
index e6d048012..bbb6213d9 100755
--- a/src/include/relation.cpp
+++ b/src/include/relation.cpp
@@ -14,7 +14,6 @@
 #include <codeb.h>
 // *** check if not already defined
 #define NOTFOUND (-1)
-
 HIDDEN void print_name(ostream& out, const TLocalisamfile& f) 
 {
   switch (f.num())
@@ -1190,6 +1189,7 @@ TRecnotype TCursor::buildcursor(TRecnotype rp)
   {
 		pi.add_status();
     const char *s0 = DB_index_getkey(fhnd);
+
     if (l && (strncmp(to(), s0, l) < 0)) 
       break;
     const TRecnotype recno = DB_index_recno(fhnd);