diff --git a/Docs/Web.config b/Docs/Web.config
index c3776adb3..c1eabfeb9 100644
--- a/Docs/Web.config
+++ b/Docs/Web.config
@@ -8,23 +8,23 @@
     \Windows\Microsoft.Net\Framework\vx.x\Config 
 -->
 <configuration>
-  <appSettings/>
-  <connectionStrings/>
-  <system.web>
-    <!-- 
+	<appSettings/>
+	<connectionStrings/>
+	<system.web>
+		<!-- 
             Set compilation debug="true" to insert debugging 
             symbols into the compiled page. Because this 
             affects performance, set this value to true only 
             during development.
         -->
-    <compilation debug="false" targetFramework="4.0"/>
-    <!--
+		<compilation debug="false" targetFramework="4.0"/>
+		<!--
           The <authentication> section enables configuration 
           of the security authentication mode used by 
           ASP.NET to identify an incoming user. 
         -->
-    <authentication mode="Windows"/>
-    <!--
+		<authentication mode="Windows"/>
+		<!--
            The <customErrors> section enables configuration 
            of what to do if/when an unhandled error occurs 
            during the execution of a request. Specifically, 
@@ -36,10 +36,10 @@
              <error statusCode="404" redirect="FileNotFound.htm" />
            </customErrors>
         -->
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
-  </system.web>
-  <!-- 
+		<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
+	</system.web>
+	<!-- 
         The system.webServer section is required for running ASP.NET AJAX under Internet
         Information Services 7.0.  It is not necessary for previous version of IIS.
     -->
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/Setup2/Cosmos.iss b/Setup2/Cosmos.iss
index 0df6238b6..8f9fac9fd 100644
--- a/Setup2/Cosmos.iss
+++ b/Setup2/Cosmos.iss
@@ -389,6 +389,7 @@ Root: HKCR; SubKey: Cosmos.ProjectFile\shell\open\command; ValueType: string; Va
 Filename: {code:VSNET2010_PATH}\VSIXInstaller.exe; Parameters: "/quiet /u:e2ce86d3-fb0b-43ad-938a-5bcdd087ea2d"; Flags: waituntilterminated
 Filename: {code:VSNET2010_PATH}\VSIXInstaller.exe; Parameters: "/quiet /u:e2ce86d3-fb0b-43ad-938a-5bcdd087ea2d"; Flags: waituntilterminated
 Filename: {code:VSNET2010_PATH}\VSIXInstaller.exe; Parameters: "/quiet ""{app}\Build\VSIP\Cosmos.VS.XSharp.vsix"""; Flags: waituntilterminated
+Filename: "{app}\Build\Tools\sqllite.exe"; Flags: waituntilterminated
 
 ; Forces VS to merge the resource metadata that describes menus, toolbars, and command groups from all VSPackages available.
 #if BuildConfiguration == "Devkit"
diff --git a/source/Cosmos.sln b/source/Cosmos.sln
index d83b0e1f1..866204f05 100644
--- a/source/Cosmos.sln
+++ b/source/Cosmos.sln
@@ -73,7 +73,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Docs", "..\Docs", "{67E7DEF
 		SccAuxPath = "SAK"
 		SccLocalPath = "SAK"
 		SccProvider = "SAK"
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv3.5"
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
 		Debug.AspNetCompiler.VirtualPath = "/Docs"
 		Debug.AspNetCompiler.PhysicalPath = "..\Docs\"
 		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Docs\"
@@ -227,272 +227,20 @@ Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "GeramysTestBoot", "GeramysT
 		{DA4198CA-59DF-41B3-9884-867647900D76} = {DA4198CA-59DF-41B3-9884-867647900D76}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground", "..\source2\users\Matthijs\Playground\Playground.csproj", "{89868CAD-AAFC-45F1-81B3-C323F87D5742}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Playground", "..\source2\Users\Matthijs\Playground\Playground.csproj", "{89868CAD-AAFC-45F1-81B3-C323F87D5742}"
 EndProject
-Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "PlaygroundBoot", "..\source2\users\Matthijs\Playground\PlaygroundBoot.Cosmos", "{7D29D57D-A78B-4E67-BBC3-DF84BD10FC6D}"
+Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "PlaygroundBoot", "..\source2\Users\Matthijs\Playground\PlaygroundBoot.Cosmos", "{7D29D57D-A78B-4E67-BBC3-DF84BD10FC6D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{89868CAD-AAFC-45F1-81B3-C323F87D5742} = {89868CAD-AAFC-45F1-81B3-C323F87D5742}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DebugCompiler", "..\source2\users\Matthijs\DebugCompiler\DebugCompiler.csproj", "{3720749F-1519-4A35-B944-FF05AD01F8DC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DebugCompiler", "..\source2\Users\Matthijs\DebugCompiler\DebugCompiler.csproj", "{3720749F-1519-4A35-B944-FF05AD01F8DC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7D29D57D-A78B-4E67-BBC3-DF84BD10FC6D} = {7D29D57D-A78B-4E67-BBC3-DF84BD10FC6D}
 		{89868CAD-AAFC-45F1-81B3-C323F87D5742} = {89868CAD-AAFC-45F1-81B3-C323F87D5742}
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 62
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = https://tfs.codeplex.com/tfs/tfs04
-		SccLocalPath0 = .
-		SccProjectUniqueName1 = Cosmos\\Cosmos.Kernel\\Cosmos.Kernel.csproj
-		SccProjectTopLevelParentUniqueName1 = Cosmos.sln
-		SccProjectName1 = Cosmos/Cosmos.Kernel
-		SccLocalPath1 = Cosmos\\Cosmos.Kernel
-		SccProjectUniqueName2 = Cosmos\\Cosmos.Kernel.Plugs\\Cosmos.Kernel.Plugs.csproj
-		SccProjectTopLevelParentUniqueName2 = Cosmos.sln
-		SccProjectName2 = Cosmos/Cosmos.Kernel.Plugs
-		SccLocalPath2 = Cosmos\\Cosmos.Kernel.Plugs
-		SccProjectUniqueName3 = Cosmos\\Cosmos.System\\Cosmos.Sys.csproj
-		SccProjectTopLevelParentUniqueName3 = Cosmos.sln
-		SccProjectName3 = Cosmos/Cosmos.System
-		SccLocalPath3 = Cosmos\\Cosmos.System
-		SccProjectUniqueName4 = Cosmos\\Cosmos.Sys.Plugs\\Cosmos.Sys.Plugs.csproj
-		SccProjectTopLevelParentUniqueName4 = Cosmos.sln
-		SccProjectName4 = Cosmos/Cosmos.Sys.Plugs
-		SccLocalPath4 = Cosmos\\Cosmos.Sys.Plugs
-		SccProjectUniqueName5 = Cosmos.Kernel.FileSystems\\Cosmos.Sys.FileSystem.csproj
-		SccProjectTopLevelParentUniqueName5 = Cosmos.sln
-		SccProjectName5 = Cosmos.Kernel.FileSystems
-		SccLocalPath5 = Cosmos.Kernel.FileSystems
-		SccProjectUniqueName6 = ..\\source2\\Build\\Cosmos.Build.Common\\Cosmos.Build.Common.csproj
-		SccProjectTopLevelParentUniqueName6 = Cosmos.sln
-		SccProjectName6 = ../source2/Build/Cosmos.Build.Common
-		SccAuxPath6 = https://tfs.codeplex.com/tfs/TFS04
-		SccLocalPath6 = ..\\source2\\Build\\Cosmos.Build.Common
-		SccProjectUniqueName7 = ..\\source2\\Build\\Cosmos.Build.MSBuild\\Cosmos.Build.MSBuild.csproj
-		SccProjectTopLevelParentUniqueName7 = Cosmos.sln
-		SccProjectName7 = ../source2/Build/Cosmos.Build.MSBuild
-		SccLocalPath7 = ..\\source2\\Build\\Cosmos.Build.MSBuild
-		SccProjectUniqueName8 = ..\\source2\\Debug\\Cosmos.Debug.Common\\Cosmos.Debug.Common.csproj
-		SccProjectTopLevelParentUniqueName8 = Cosmos.sln
-		SccProjectName8 = ../source2/Debug/Cosmos.Debug.Common
-		SccLocalPath8 = ..\\source2\\Debug\\Cosmos.Debug.Common
-		SccProjectUniqueName9 = ..\\source2\\Debug\\Cosmos.Debug.VSDebugEngine\\Cosmos.Debug.VSDebugEngine.csproj
-		SccProjectTopLevelParentUniqueName9 = Cosmos.sln
-		SccProjectName9 = ../source2/Debug/Cosmos.Debug.VSDebugEngine
-		SccLocalPath9 = ..\\source2\\Debug\\Cosmos.Debug.VSDebugEngine
-		SccProjectUniqueName10 = ..\\source2\\VSIP\\Cosmos.VS.Package\\Cosmos.VS.Package.csproj
-		SccProjectTopLevelParentUniqueName10 = Cosmos.sln
-		SccProjectName10 = ../source2/VSIP/Cosmos.VS.Package
-		SccLocalPath10 = ..\\source2\\VSIP\\Cosmos.VS.Package
-		SccProjectUniqueName11 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU\\Cosmos.IL2CPU.csproj
-		SccProjectTopLevelParentUniqueName11 = Cosmos.sln
-		SccProjectName11 = ../source2/IL2CPU/Cosmos.IL2CPU
-		SccLocalPath11 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU
-		SccProjectUniqueName12 = Cosmos.Hardware.SMBIOS\\Cosmos.Hardware.SMBIOS.csproj
-		SccProjectTopLevelParentUniqueName12 = Cosmos.sln
-		SccProjectName12 = Cosmos.Hardware.SMBIOS
-		SccLocalPath12 = Cosmos.Hardware.SMBIOS
-		SccProjectUniqueName13 = ..\\source2\\Users\\Gero\u0020Landmann\\Cosmos.Assembler.X86.Gero\\Cosmos.Assembler.X86.Gero.csproj
-		SccProjectTopLevelParentUniqueName13 = Cosmos.sln
-		SccProjectName13 = ../source2/Users/Gero\u0020Landmann/Cosmos.Assembler.X86.Gero
-		SccLocalPath13 = ..\\source2\\Users\\Gero\u0020Landmann\\Cosmos.Assembler.X86.Gero
-		SccProjectUniqueName14 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU.Plugs\\Cosmos.IL2CPU.Plugs.csproj
-		SccProjectTopLevelParentUniqueName14 = Cosmos.sln
-		SccProjectName14 = ../source2/IL2CPU/Cosmos.IL2CPU.Plugs
-		SccLocalPath14 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU.Plugs
-		SccProjectUniqueName15 = ..\\source2\\Debug\\Cosmos.Debug.GDB\\Cosmos.Debug.GDB.csproj
-		SccProjectTopLevelParentUniqueName15 = Cosmos.sln
-		SccProjectName15 = ../source2/Debug/Cosmos.Debug.GDB
-		SccLocalPath15 = ..\\source2\\Debug\\Cosmos.Debug.GDB
-		SccProjectUniqueName16 = Cosmos\\Cosmos.Hardware\\Cosmos.Hardware2.csproj
-		SccProjectTopLevelParentUniqueName16 = Cosmos.sln
-		SccProjectName16 = Cosmos/Cosmos.Hardware
-		SccLocalPath16 = Cosmos\\Cosmos.Hardware
-		SccProjectUniqueName17 = ..\\source2\\Kernel\\System\\Hardware\\Core\\Cosmos.Core\\Cosmos.Core.csproj
-		SccProjectTopLevelParentUniqueName17 = Cosmos.sln
-		SccProjectName17 = ../source2/Kernel/System/Hardware/Core/Cosmos.Core
-		SccLocalPath17 = ..\\source2\\Kernel\\System\\Hardware\\Core\\Cosmos.Core
-		SccProjectUniqueName18 = ..\\source2\\Kernel\\System\\Hardware\\Cosmos.Hardware\\Cosmos.Hardware.csproj
-		SccProjectTopLevelParentUniqueName18 = Cosmos.sln
-		SccProjectName18 = ../source2/Kernel/System/Hardware/Cosmos.Hardware
-		SccLocalPath18 = ..\\source2\\Kernel\\System\\Hardware\\Cosmos.Hardware
-		SccProjectUniqueName19 = ..\\source2\\Kernel\\System\\Cosmos.System\\Cosmos.System.csproj
-		SccProjectTopLevelParentUniqueName19 = Cosmos.sln
-		SccProjectName19 = ../source2/Kernel/System/Cosmos.System
-		SccLocalPath19 = ..\\source2\\Kernel\\System\\Cosmos.System
-		SccProjectUniqueName20 = ..\\source2\\Kernel\\System\\Cosmos.System.Plugs.System\\Cosmos.System.Plugs.System.csproj
-		SccProjectTopLevelParentUniqueName20 = Cosmos.sln
-		SccProjectName20 = ../source2/Kernel/System/Cosmos.System.Plugs.System
-		SccLocalPath20 = ..\\source2\\Kernel\\System\\Cosmos.System.Plugs.System
-		SccProjectUniqueName21 = ..\\source2\\VSIP\\Cosmos.VS.Wizards\\Cosmos.VS.Wizards.csproj
-		SccProjectTopLevelParentUniqueName21 = Cosmos.sln
-		SccProjectName21 = ../source2/VSIP/Cosmos.VS.Wizards
-		SccLocalPath21 = ..\\source2\\VSIP\\Cosmos.VS.Wizards
-		SccProjectUniqueName22 = ..\\source2\\Kernel\\System\\Hardware\\Core\\Cosmos.Core.Plugs\\Cosmos.Core.Plugs.csproj
-		SccProjectTopLevelParentUniqueName22 = Cosmos.sln
-		SccProjectName22 = ../source2/Kernel/System/Hardware/Core/Cosmos.Core.Plugs
-		SccLocalPath22 = ..\\source2\\Kernel\\System\\Hardware\\Core\\Cosmos.Core.Plugs
-		SccProjectUniqueName23 = ..\\source2\\Kernel\\Debug\\Cosmos.Debug.Kernel\\Cosmos.Debug.Kernel.csproj
-		SccProjectTopLevelParentUniqueName23 = Cosmos.sln
-		SccProjectName23 = ../source2/Kernel/Debug/Cosmos.Debug.Kernel
-		SccLocalPath23 = ..\\source2\\Kernel\\Debug\\Cosmos.Debug.Kernel
-		SccProjectUniqueName24 = ..\\source2\\Kernel\\Debug\\Cosmos.Debug.Kernel.Plugs\\Cosmos.Debug.Kernel.Plugs.csproj
-		SccProjectTopLevelParentUniqueName24 = Cosmos.sln
-		SccProjectName24 = ../source2/Kernel/Debug/Cosmos.Debug.Kernel.Plugs
-		SccLocalPath24 = ..\\source2\\Kernel\\Debug\\Cosmos.Debug.Kernel.Plugs
-		SccProjectUniqueName25 = ..\\source2\\Demos\\Guess\\Guess.Cosmos
-		SccProjectTopLevelParentUniqueName25 = Cosmos.sln
-		SccProjectName25 = ../source2/Demos/Guess
-		SccLocalPath25 = ..\\source2\\Demos\\Guess
-		SccProjectUniqueName26 = ..\\source2\\Kernel\\Common\\Cosmos.Common.Extensions\\Cosmos.Common.Extensions.csproj
-		SccProjectTopLevelParentUniqueName26 = Cosmos.sln
-		SccProjectName26 = ../source2/Kernel/Common/Cosmos.Common.Extensions
-		SccLocalPath26 = ..\\source2\\Kernel\\Common\\Cosmos.Common.Extensions
-		SccProjectUniqueName27 = ..\\source2\\Demos\\Guess\\GuessKernel.csproj
-		SccProjectTopLevelParentUniqueName27 = Cosmos.sln
-		SccProjectName27 = ../source2/Demos/Guess
-		SccLocalPath27 = ..\\source2\\Demos\\Guess
-		SccProjectUniqueName28 = ..\\source2\\VSIP\\Cosmos.VS.Windows\\Cosmos.VS.Windows.csproj
-		SccProjectTopLevelParentUniqueName28 = Cosmos.sln
-		SccProjectName28 = ../source2/VSIP/Cosmos.VS.Windows
-		SccLocalPath28 = ..\\source2\\VSIP\\Cosmos.VS.Windows
-		SccProjectUniqueName29 = ..\\source2\\Compiler\\Cosmos.Compiler.DebugStub\\Cosmos.Debug.DebugStub.csproj
-		SccProjectTopLevelParentUniqueName29 = Cosmos.sln
-		SccProjectName29 = ../source2/Compiler/Cosmos.Compiler.DebugStub
-		SccLocalPath29 = ..\\source2\\Compiler\\Cosmos.Compiler.DebugStub
-		SccProjectUniqueName30 = ..\\source2\\VSIP\\Cosmos.VS.Windows.Test\\Cosmos.VS.Windows.Test.csproj
-		SccProjectTopLevelParentUniqueName30 = Cosmos.sln
-		SccProjectName30 = ../source2/VSIP/Cosmos.VS.Windows.Test
-		SccLocalPath30 = ..\\source2\\VSIP\\Cosmos.VS.Windows.Test
-		SccProjectUniqueName31 = ..\\source2\\Cosmos.Assembler\\Cosmos.Assembler.csproj
-		SccProjectTopLevelParentUniqueName31 = Cosmos.sln
-		SccProjectName31 = ../source2/Cosmos.Assembler
-		SccLocalPath31 = ..\\source2\\Cosmos.Assembler
-		SccProjectUniqueName32 = ..\\source2\\Users\\SSchocke\\SSchockeTest\\SSchockeTest.csproj
-		SccProjectTopLevelParentUniqueName32 = Cosmos.sln
-		SccProjectName32 = ../source2/Users/SSchocke/SSchockeTest
-		SccLocalPath32 = ..\\source2\\Users\\SSchocke\\SSchockeTest
-		SccProjectUniqueName33 = ..\\source2\\Users\\SSchocke\\SSchockeTest\\SSchockeTestBoot.Cosmos
-		SccProjectTopLevelParentUniqueName33 = Cosmos.sln
-		SccProjectName33 = ../source2/Users/SSchocke/SSchockeTest
-		SccLocalPath33 = ..\\source2\\Users\\SSchocke\\SSchockeTest
-		SccProjectUniqueName34 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU.Profiler\\Cosmos.IL2CPU.Profiler.csproj
-		SccProjectTopLevelParentUniqueName34 = Cosmos.sln
-		SccProjectName34 = ../source2/IL2CPU/Cosmos.IL2CPU.Profiler
-		SccLocalPath34 = ..\\source2\\IL2CPU\\Cosmos.IL2CPU.Profiler
-		SccProjectUniqueName35 = ..\\source2\\Tools\\File2ByteArray\u0020Converter\\File2ByteArray\u0020Converter.csproj
-		SccProjectTopLevelParentUniqueName35 = Cosmos.sln
-		SccProjectName35 = ../source2/Tools/File2ByteArray\u0020Converter
-		SccLocalPath35 = ..\\source2\\Tools\\File2ByteArray\u0020Converter
-		SccProjectUniqueName36 = ..\\source2\\Users\\HKSplayground\\HKSplaygroundBoot.Cosmos
-		SccProjectTopLevelParentUniqueName36 = Cosmos.sln
-		SccProjectName36 = ../source2/Users/HKSplayground
-		SccLocalPath36 = ..\\source2\\Users\\HKSplayground
-		SccProjectUniqueName37 = ..\\source2\\Compiler\\Cosmos.XSharp\\Cosmos.Compiler.XSharp.csproj
-		SccProjectTopLevelParentUniqueName37 = Cosmos.sln
-		SccProjectName37 = ../source2/Compiler/Cosmos.XSharp
-		SccLocalPath37 = ..\\source2\\Compiler\\Cosmos.XSharp
-		SccProjectUniqueName38 = ..\\source2\\Build\\Cosmos.Build.Builder\\Cosmos.Build.Builder.csproj
-		SccProjectTopLevelParentUniqueName38 = Cosmos.sln
-		SccProjectName38 = ../source2/Build/Cosmos.Build.Builder
-		SccLocalPath38 = ..\\source2\\Build\\Cosmos.Build.Builder
-		SccProjectUniqueName39 = ..\\source2\\Build\\Cosmos.Build.Installer\\Cosmos.Build.Installer.csproj
-		SccProjectTopLevelParentUniqueName39 = Cosmos.sln
-		SccProjectName39 = ../source2/Build/Cosmos.Build.Installer
-		SccLocalPath39 = ..\\source2\\Build\\Cosmos.Build.Installer
-		SccProjectUniqueName40 = ..\\source2\\VSIP\\Cosmos.VS.XSharp\\Cosmos.VS.XSharp.csproj
-		SccProjectTopLevelParentUniqueName40 = Cosmos.sln
-		SccProjectName40 = ../source2/VSIP/Cosmos.VS.XSharp
-		SccLocalPath40 = ..\\source2\\VSIP\\Cosmos.VS.XSharp
-		SccProjectUniqueName41 = ..\\source2\\VMWareLib\\VMWareLib.csproj
-		SccProjectTopLevelParentUniqueName41 = Cosmos.sln
-		SccProjectName41 = ../source2/VMWareLib
-		SccLocalPath41 = ..\\source2\\VMWareLib
-		SccProjectUniqueName42 = ..\\source2\\Cosmos.Deploy.USB\\Cosmos.Deploy.USB.csproj
-		SccProjectTopLevelParentUniqueName42 = Cosmos.sln
-		SccProjectName42 = ../source2/Cosmos.Deploy.USB
-		SccLocalPath42 = ..\\source2\\Cosmos.Deploy.USB
-		SccProjectUniqueName43 = ..\\source2\\Cosmos.Deploy.Pixie\\Cosmos.Deploy.Pixie.csproj
-		SccProjectTopLevelParentUniqueName43 = Cosmos.sln
-		SccProjectName43 = ../source2/Cosmos.Deploy.Pixie
-		SccLocalPath43 = ..\\source2\\Cosmos.Deploy.Pixie
-		SccProjectUniqueName44 = ..\\XSharp\\source\\XSharp.Test\\XSharp.Test.csproj
-		SccProjectTopLevelParentUniqueName44 = Cosmos.sln
-		SccProjectName44 = ../XSharp/source/XSharp.Test
-		SccLocalPath44 = ..\\XSharp\\source\\XSharp.Test
-		SccProjectUniqueName45 = ..\\XSharp\\source\\XSharp.XSC\\XSharp.XSC.csproj
-		SccProjectTopLevelParentUniqueName45 = Cosmos.sln
-		SccProjectName45 = ../XSharp/source/XSharp.XSC
-		SccLocalPath45 = ..\\XSharp\\source\\XSharp.XSC
-		SccProjectUniqueName46 = ..\\XSharp\\source\\XSharp.Nasm\\XSharp.Nasm.csproj
-		SccProjectTopLevelParentUniqueName46 = Cosmos.sln
-		SccProjectName46 = ../XSharp/source/XSharp.Nasm
-		SccLocalPath46 = ..\\XSharp\\source\\XSharp.Nasm
-		SccProjectUniqueName47 = ..\\source2\\MDbg4\\src\\debugger\\raw\\raw.csproj
-		SccProjectTopLevelParentUniqueName47 = Cosmos.sln
-		SccProjectName47 = ../source2/MDbg4/src/debugger/raw
-		SccLocalPath47 = ..\\source2\\MDbg4\\src\\debugger\\raw
-		SccProjectUniqueName48 = ..\\source2\\MDbg4\\src\\debugger\\NativeDebugWrappers\\NativeDebugWrappers.csproj
-		SccProjectTopLevelParentUniqueName48 = Cosmos.sln
-		SccProjectName48 = ../source2/MDbg4/src/debugger/NativeDebugWrappers
-		SccLocalPath48 = ..\\source2\\MDbg4\\src\\debugger\\NativeDebugWrappers
-		SccProjectUniqueName49 = ..\\source2\\MDbg4\\src\\debugger\\corapi\\corapi.csproj
-		SccProjectTopLevelParentUniqueName49 = Cosmos.sln
-		SccProjectName49 = ../source2/MDbg4/src/debugger/corapi
-		SccLocalPath49 = ..\\source2\\MDbg4\\src\\debugger\\corapi
-		SccProjectUniqueName50 = ..\\source2\\Users\\Kudzu\\Hive\\Kudzu.Hive\\Kudzu.Hive.csproj
-		SccProjectTopLevelParentUniqueName50 = Cosmos.sln
-		SccProjectName50 = ../source2/Users/Kudzu/Hive/Kudzu.Hive
-		SccLocalPath50 = ..\\source2\\Users\\Kudzu\\Hive\\Kudzu.Hive
-		SccProjectUniqueName51 = ..\\source2\\Users\\Kudzu\\Breakpoints\\Kudzu.Breakpoints.Cosmos
-		SccProjectTopLevelParentUniqueName51 = Cosmos.sln
-		SccProjectName51 = ../source2/Users/Kudzu/Breakpoints
-		SccLocalPath51 = ..\\source2\\Users\\Kudzu\\Breakpoints
-		SccProjectUniqueName52 = ..\\source2\\Users\\Kudzu\\Breakpoints\\Kudzu.BreakpointsKernel.csproj
-		SccProjectTopLevelParentUniqueName52 = Cosmos.sln
-		SccProjectName52 = ../source2/Users/Kudzu/Breakpoints
-		SccLocalPath52 = ..\\source2\\Users\\Kudzu\\Breakpoints
-		SccProjectUniqueName53 = ..\\source2\\Users\\BlueSkeye\\GuessForBochs\\GuessForBochs.Cosmos
-		SccProjectTopLevelParentUniqueName53 = Cosmos.sln
-		SccProjectName53 = ../source2/Users/BlueSkeye/GuessForBochs
-		SccLocalPath53 = ..\\source2\\Users\\BlueSkeye\\GuessForBochs
-		SccProjectUniqueName54 = ..\\source2\\Users\\GeramyLovelessTest\\GeramyLovelessTest.csproj
-		SccProjectTopLevelParentUniqueName54 = Cosmos.sln
-		SccProjectName54 = ../source2/Users/GeramyLovelessTest
-		SccLocalPath54 = ..\\source2\\Users\\GeramyLovelessTest
-		SccProjectUniqueName55 = ..\\source2\\Users\\GeramyLovelessTest\\GeramyLovelessTestBoot.Cosmos
-		SccProjectTopLevelParentUniqueName55 = Cosmos.sln
-		SccProjectName55 = ../source2/Users/GeramyLovelessTest
-		SccLocalPath55 = ..\\source2\\Users\\GeramyLovelessTest
-		SccProjectUniqueName56 = GeramysTest\\GeramysTest.csproj
-		SccProjectTopLevelParentUniqueName56 = Cosmos.sln
-		SccProjectName56 = GeramysTest
-		SccLocalPath56 = GeramysTest
-		SccProjectUniqueName57 = GeramysTest\\GeramysTestBoot.Cosmos
-		SccProjectTopLevelParentUniqueName57 = Cosmos.sln
-		SccProjectName57 = GeramysTest
-		SccLocalPath57 = GeramysTest
-		SccWebProject58 = true
-		SccProjectUniqueName58 = ..\\Docs
-		SccProjectName58 = ../Docs
-		SccLocalPath58 = ..\\Docs
-		SccProjectEnlistmentChoice58 = 2
-		SccProjectUniqueName59 = ..\\source2\\users\\Matthijs\\Playground\\Playground.csproj
-		SccProjectTopLevelParentUniqueName59 = Cosmos.sln
-		SccProjectName59 = ../source2/users/Matthijs/Playground
-		SccLocalPath59 = ..\\source2\\users\\Matthijs\\Playground
-		SccProjectUniqueName60 = ..\\source2\\users\\Matthijs\\Playground\\PlaygroundBoot.Cosmos
-		SccProjectTopLevelParentUniqueName60 = Cosmos.sln
-		SccProjectName60 = ../source2/users/Matthijs/Playground
-		SccLocalPath60 = ..\\source2\\users\\Matthijs\\Playground
-		SccProjectUniqueName61 = ..\\source2\\users\\Matthijs\\DebugCompiler\\DebugCompiler.csproj
-		SccProjectTopLevelParentUniqueName61 = Cosmos.sln
-		SccProjectName61 = ../source2/users/Matthijs/DebugCompiler
-		SccLocalPath61 = ..\\source2\\users\\Matthijs\\DebugCompiler
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -1211,7 +959,6 @@ Global
 		{9588D51E-243F-4ABA-AED2-A77DA0634209} = {A4478219-065D-4928-BB4D-4358CAD39A03}
 		{CD291145-6AD0-41CD-9986-2044F41660DE} = {A4478219-065D-4928-BB4D-4358CAD39A03}
 		{CB974478-09B8-4907-980F-6B7889645D93} = {A4478219-065D-4928-BB4D-4358CAD39A03}
-		{E5647BFD-1507-4F02-A7D5-E0F9D6AECE3A} = {9D82B35C-7133-4ADE-AA5C-0FFB2BFA8BA6}
 		{8E71FA9E-BB28-4B34-AB11-729E33B8C8E6} = {9D82B35C-7133-4ADE-AA5C-0FFB2BFA8BA6}
 		{91CBD640-C07D-4556-B4CB-6F8CD88C67C9} = {9D82B35C-7133-4ADE-AA5C-0FFB2BFA8BA6}
 		{C801F19C-A9D3-42D5-9A57-9FFDF9B4D05E} = {6A15C540-8278-4B9C-B890-FA57FB6AE6A6}
@@ -1219,7 +966,6 @@ Global
 		{F708C866-1C9B-4579-8C28-0728ECCFC1ED} = {6A15C540-8278-4B9C-B890-FA57FB6AE6A6}
 		{6658FCE0-7032-4B7B-BD95-F2765C393442} = {2DF5F17F-4890-4856-ADFD-4DE23282C3B7}
 		{89868CAD-AAFC-45F1-81B3-C323F87D5742} = {0CF14D0F-6054-4D3D-9062-E3D2EB064A4E}
-		{7D29D57D-A78B-4E67-BBC3-DF84BD10FC6D} = {0CF14D0F-6054-4D3D-9062-E3D2EB064A4E}
 		{3720749F-1519-4A35-B944-FF05AD01F8DC} = {0CF14D0F-6054-4D3D-9062-E3D2EB064A4E}
 		{1116130E-28E0-428A-A597-F4B3B676C0CA} = {576C3D3B-A3EA-44FA-8E39-AFD3E6F3FE23}
 		{693C6704-6934-410F-97E0-4B6900730E63} = {426E77A5-80AA-48DC-97F9-037071345778}
@@ -1233,18 +979,13 @@ Global
 		{5AC4773C-CB4E-4CD9-8D50-02E10A07DEE6} = {ADDA07A5-ADA8-4D71-831B-0A421F04A546}
 		{D9A87AAD-FCC9-4517-B31D-E904DAD00784} = {ADDA07A5-ADA8-4D71-831B-0A421F04A546}
 		{73CF15C1-0AB6-4B3A-8142-D326ADA72970} = {C4941654-3D7A-484B-9F5C-3D331AB8F585}
-		{5B2C0369-7A84-4113-892C-F71B50E1DA12} = {C4941654-3D7A-484B-9F5C-3D331AB8F585}
 		{61607F1E-58F9-41CF-972F-128384F3E115} = {E3779B95-E47B-4CAD-B8C1-0549E30AA4F2}
 		{B97A2956-C363-47F2-A6AA-B4FCCFF4D315} = {E3779B95-E47B-4CAD-B8C1-0549E30AA4F2}
 		{1FAC100C-D732-4EA4-B518-5AF4BAF64F2E} = {CDF13174-7897-4334-9AE4-B1DCC013F6BD}
 		{9C96A7B5-19E5-4923-9569-DB9454E69C82} = {B521E2A2-81E4-4B2D-A471-7AB550E9551E}
 		{0AAD9114-6F08-4344-A282-CD6BC77595E5} = {4831F868-2418-4277-A91F-4F599604CB29}
-		{4527D60E-25F4-4617-B463-7CDA3C219097} = {4831F868-2418-4277-A91F-4F599604CB29}
-		{D048E0B1-8B2B-4A99-8376-7FC8A0656A05} = {9588D51E-243F-4ABA-AED2-A77DA0634209}
 		{6C14B7D1-CACB-4049-A0BD-9CAC5CFCF2C2} = {CD291145-6AD0-41CD-9986-2044F41660DE}
-		{86F88A09-6801-4474-BFC8-EF09F3A9B89D} = {CD291145-6AD0-41CD-9986-2044F41660DE}
 		{DA4198CA-59DF-41B3-9884-867647900D76} = {CD291145-6AD0-41CD-9986-2044F41660DE}
-		{0A7DF241-1000-405D-A09B-9E2C51A5CB95} = {CD291145-6AD0-41CD-9986-2044F41660DE}
 		{FB71E8EF-E229-4D81-984A-B9170D752BF9} = {9C8A3E55-9045-44CA-BFD4-16D5B4343A90}
 		{A281A1B1-C718-4BCB-A7BE-ED840A70449A} = {9C8A3E55-9045-44CA-BFD4-16D5B4343A90}
 		{2A59517C-356E-4B55-B155-50335BF482FB} = {9C8A3E55-9045-44CA-BFD4-16D5B4343A90}
@@ -1257,6 +998,5 @@ Global
 		{04EF9865-E1B1-403D-802B-E4FAEA50A634} = {43291572-4714-44FD-BF37-F5C21A758C33}
 		{56DA139A-D2E1-45ED-B5A2-18DD5DE943F6} = {CB974478-09B8-4907-980F-6B7889645D93}
 		{138FA8BF-3728-430F-B17D-6CBCA7ADEE2F} = {CB974478-09B8-4907-980F-6B7889645D93}
-		{5DE37AE3-3F59-4D15-851B-945C23DBB633} = {138FA8BF-3728-430F-B17D-6CBCA7ADEE2F}
 	EndGlobalSection
 EndGlobal
diff --git a/source2/Kernel/System/Hardware/Core/Cosmos.Core/PCIDeviceNormal.cs b/source2/Kernel/System/Hardware/Core/Cosmos.Core/PCIDeviceNormal.cs
index 0eeaef6f3..3815c3694 100644
--- a/source2/Kernel/System/Hardware/Core/Cosmos.Core/PCIDeviceNormal.cs
+++ b/source2/Kernel/System/Hardware/Core/Cosmos.Core/PCIDeviceNormal.cs
@@ -39,7 +39,7 @@ namespace Cosmos.Core
 
             ExpansionROMBaseAddress = ReadRegister32(0x30);
 
-            CapabilitiesPointer = ReadRegister8(0x37);
+            CapabilitiesPointer = ReadRegister8(0x34);
 
             MinGrant = ReadRegister8(0x3E);
             MaxLatency = ReadRegister8(0x3F);
diff --git a/source2/VMWareLib/App.config b/source2/VMWareLib/App.config
index c316184ab..24055bea4 100644
--- a/source2/VMWareLib/App.config
+++ b/source2/VMWareLib/App.config
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <configuration>
 	<startup>
-	<supportedRuntime version="v2.0.50727"/></startup>
+	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
 </configuration>
diff --git a/source2/VMWareLib/VMWareLib.csproj b/source2/VMWareLib/VMWareLib.csproj
index a71cdf1df..2105558e3 100644
--- a/source2/VMWareLib/VMWareLib.csproj
+++ b/source2/VMWareLib/VMWareLib.csproj
@@ -15,7 +15,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -105,7 +105,7 @@
   <ItemGroup>
     <Reference Include="Interop.VixCOM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a2e7e25925ba452, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
       <HintPath>.\Interop.VixCOM.dll</HintPath>
     </Reference>
     <Reference Include="System" />