diff --git a/.gitignore b/.gitignore
index 7b2cb597d..15000b782 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,13 @@ Makefile.in
 /src/spinit
 
 !/xgraph/Makefile.in
+
+/visualc/console_debug
+/visualc/console_release
+/visualc/console_release_omp
+/visualc/Debug
+/visualc/Release
+/visualc/ReleaseOMP
+/visualc/vngspice.vcproj.*
+/visualc/vngspice.suo
+/visualc/vngspice.ncb
diff --git a/visualc/vngspice.sln b/visualc/vngspice.sln
index d23509e0b..f111c8e76 100644
--- a/visualc/vngspice.sln
+++ b/visualc/vngspice.sln
@@ -22,9 +22,9 @@ Global
 		{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_debug|Win32.Build.0 = console_debug|Win32
 		{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_debug|x64.ActiveCfg = console_debug|x64
 		{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_debug|x64.Build.0 = console_debug|x64
-		{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_release_omp|Win32.ActiveCfg = console_release|Win32
-		{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_release_omp|x64.ActiveCfg = console_release|x64
-		{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_release_omp|x64.Build.0 = console_release|x64
+		{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_release_omp|Win32.ActiveCfg = console_release_omp|Win32
+		{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_release_omp|x64.ActiveCfg = console_release_omp|x64
+		{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_release_omp|x64.Build.0 = console_release_omp|x64
 		{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_release|Win32.ActiveCfg = console_release|Win32
 		{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_release|Win32.Build.0 = console_release|Win32
 		{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.console_release|x64.ActiveCfg = console_release|x64
@@ -46,8 +46,8 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		AMDCaPersistentConfig = Debug|Win32
-		AMDCaPersistentStartup = vngspice
 		AMDCaProjectFile = D:\Spice_general\ng-spice-rework\visualc\CodeAnalyst\vngspice.caw
+		AMDCaPersistentStartup = vngspice
+		AMDCaPersistentConfig = Debug|Win32
 	EndGlobalSection
 EndGlobal
diff --git a/visualc/vngspice.vcproj b/visualc/vngspice.vcproj
index bdf2e7042..149f2608d 100644
--- a/visualc/vngspice.vcproj
+++ b/visualc/vngspice.vcproj
@@ -33,8 +33,8 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Custom defined Build: Recompile conf.c with actual date"
-				CommandLine="del $(IntDir)\conf.obj&#x0D;&#x0A;"
-				Outputs="$(IntDir)\conf.obj"
+				CommandLine="del $(ConfigurationName)\$(PlatformName)\conf.obj&#x0D;&#x0A;"
+				Outputs="$(ConfigurationName)\$(PlatformName)\conf.obj"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\src\maths\poly&quot;;&quot;$(ProjectDir)..\src\frontend&quot;;&quot;$(ProjectDir)..\src\spicelib\devices&quot;;&quot;$(ProjectDir)include&quot;;&quot;$(ProjectDir)..\src\include&quot;;&quot;C:\Program Files (x86)\Visual Leak Detector\include&quot;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;SIMULATOR;NGDEBUG;XSPICE"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;SIMULATOR;NGDEBUG;XSPICE;EXPERIMENTAL_CODE"
 				MinimalRebuild="true"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="0"
@@ -124,8 +124,8 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Custom defined Build: Recompile conf.c with actual date"
-				CommandLine="del $(IntDir)\conf.obj&#x0D;&#x0A;"
-				Outputs="$(IntDir)\conf.obj"
+				CommandLine="del $(ConfigurationName)\$(PlatformName)\conf.obj"
+				Outputs="$(ConfigurationName)\$(PlatformName)\conf.obj"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -213,8 +213,8 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Custom defined Build: Recompile conf.c with actual date"
-				CommandLine="del $(IntDir)\conf.obj&#x0D;&#x0A;"
-				Outputs="$(IntDir)\conf.obj"
+				CommandLine="del $(ConfigurationName)\$(PlatformName)\conf.obj&#x0D;&#x0A;"
+				Outputs="$(ConfigurationName)\$(PlatformName)\conf.obj"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -308,8 +308,8 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Custom defined Build: Recompile conf.c with actual date"
-				CommandLine="del $(IntDir)\conf.obj&#x0D;&#x0A;"
-				Outputs="$(IntDir)\conf.obj"
+				CommandLine="del $(ConfigurationName)\$(PlatformName)\conf.obj"
+				Outputs="$(ConfigurationName)\$(PlatformName)\conf.obj"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -392,8 +392,8 @@
 		</Configuration>
 		<Configuration
 			Name="console_debug|Win32"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			>
 			<Tool
@@ -404,8 +404,8 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Custom defined Build: Recompile conf.c with actual date"
-				CommandLine="del $(IntDir)\conf.obj&#x0D;&#x0A;"
-				Outputs="$(IntDir)\conf.obj"
+				CommandLine="del $(ConfigurationName)\$(PlatformName)\conf.obj&#x0D;&#x0A;"
+				Outputs="$(ConfigurationName)\$(PlatformName)\conf.obj"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -481,8 +481,8 @@
 		</Configuration>
 		<Configuration
 			Name="console_debug|x64"
-			OutputDirectory="$(ConfigurationName)\$(PlatformName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			>
 			<Tool
@@ -493,8 +493,8 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Custom defined Build: Recompile conf.c with actual date"
-				CommandLine="del $(IntDir)\conf.obj&#x0D;&#x0A;"
-				Outputs="$(IntDir)\conf.obj"
+				CommandLine="del $(ConfigurationName)\$(PlatformName)\conf.obj"
+				Outputs="$(ConfigurationName)\$(PlatformName)\conf.obj"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -582,8 +582,8 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Custom defined Build: Recompile conf.c with actual date"
-				CommandLine="del $(IntDir)\conf.obj&#x0D;&#x0A;"
-				Outputs="$(IntDir)\conf.obj"
+				CommandLine="del $(ConfigurationName)\$(PlatformName)\conf.obj&#x0D;&#x0A;"
+				Outputs="$(ConfigurationName)\$(PlatformName)\conf.obj"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -676,8 +676,8 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Custom defined Build: Recompile conf.c with actual date"
-				CommandLine="del $(IntDir)\conf.obj&#x0D;&#x0A;"
-				Outputs="$(IntDir)\conf.obj"
+				CommandLine="del $(ConfigurationName)\$(PlatformName)\conf.obj"
+				Outputs="$(ConfigurationName)\$(PlatformName)\conf.obj"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -866,7 +866,7 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Custom defined Build: Recompile conf.c with actual date"
-				CommandLine="del $(ConfigurationName)\$(PlatformName)\conf.obj&#x0D;&#x0A;"
+				CommandLine="del $(ConfigurationName)\$(PlatformName)\conf.obj"
 				Outputs="$(ConfigurationName)\$(PlatformName)\conf.obj"
 			/>
 			<Tool
@@ -950,9 +950,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="ReleaseOMP64|Win32"
+			Name="console_release_omp|Win32"
 			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
 			WholeProgramOptimization="1"
 			>
@@ -962,8 +962,8 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Custom defined Build: Recompile conf.c with actual date"
-				CommandLine="del $(IntDir)\conf.obj&#x0D;&#x0A;"
-				Outputs="$(IntDir)\conf.obj"
+				CommandLine="del $(ConfigurationName)\$(PlatformName)\conf.obj&#x0D;&#x0A;"
+				Outputs="$(ConfigurationName)\$(PlatformName)\conf.obj"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -981,7 +981,7 @@
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\src\maths\poly&quot;;&quot;$(ProjectDir)..\src\frontend&quot;;&quot;$(ProjectDir)..\src\spicelib\devices&quot;;&quot;$(ProjectDir)..\src\include&quot;;&quot;$(ProjectDir)include&quot;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;SIMULATOR;USE_OMP"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;SIMULATOR;CONSOLE;USE_OMP"
 				MinimalRebuild="false"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="0"
@@ -1007,10 +1007,10 @@
 				Name="VCLinkerTool"
 				UseUnicodeResponseFiles="false"
 				AdditionalDependencies="psapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_omp.exe"
+				OutputFile="$(OutDir)\$(ProjectName)_omp_c.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
-				SubSystem="2"
+				SubSystem="1"
 				HeapReserveSize="0"
 				HeapCommitSize="0"
 				StackReserveSize="0"
@@ -1045,7 +1045,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="ReleaseOMP64|x64"
+			Name="console_release_omp|x64"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)\$(PlatformName)"
 			ConfigurationType="1"
@@ -1057,8 +1057,8 @@
 			<Tool
 				Name="VCCustomBuildTool"
 				Description="Custom defined Build: Recompile conf.c with actual date"
-				CommandLine="del $(IntDir)\conf.obj&#x0D;&#x0A;"
-				Outputs="$(IntDir)\conf.obj"
+				CommandLine="del $(ConfigurationName)\$(PlatformName)\conf.obj"
+				Outputs="$(ConfigurationName)\$(PlatformName)\conf.obj"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -1077,13 +1077,12 @@
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\src\maths\poly&quot;;&quot;$(ProjectDir)..\src\frontend&quot;;&quot;$(ProjectDir)..\src\spicelib\devices&quot;;&quot;$(ProjectDir)..\src\include&quot;;&quot;$(ProjectDir)include&quot;"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;SIMULATOR;USE_OMP;CONFIG64"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;SIMULATOR;CONSOLE"
 				MinimalRebuild="false"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
-				OpenMP="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -1103,10 +1102,10 @@
 				Name="VCLinkerTool"
 				UseUnicodeResponseFiles="false"
 				AdditionalDependencies="psapi.lib"
-				OutputFile="$(OutDir)\$(ProjectName)64_omp.exe"
+				OutputFile="$(OutDir)\$(ProjectName)64_omp_c.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="false"
-				SubSystem="2"
+				SubSystem="1"
 				HeapReserveSize="0"
 				HeapCommitSize="0"
 				StackReserveSize="0"