diff --git a/Run-TestWorld-PeterBochs-Debugger.bat b/Run-TestWorld-PeterBochs-Debugger.bat
new file mode 100644
index 0000000000..95506a7eaf
--- /dev/null
+++ b/Run-TestWorld-PeterBochs-Debugger.bat
@@ -0,0 +1,8 @@
+cd Source
+CALL Compile-Debug.bat
+cd ..\Run
+CALL Compile.bat Mosa.TestWorld.x86.exe
+START notepad.exe build\hello.map
+START notepad.exe build\asm.txt
+CALL Run-PeterBochs-Debugger.bat
+
diff --git a/Run/Bochs/LaunchPeterBochsDebugger.bat b/Run/Bochs/LaunchPeterBochsDebugger.bat
index 6077d464f8..14a53861b1 100644
--- a/Run/Bochs/LaunchPeterBochsDebugger.bat
+++ b/Run/Bochs/LaunchPeterBochsDebugger.bat
@@ -1,11 +1,9 @@
 set BOCHS=%CD%\..\..\Tools\Bochs
 set SETTINGS=%CD%
 
-
-IF EXIST "%ProgramFiles(x86)%\Java\jre6\bin\Java.exe" SET JAVA="%ProgramFiles(x86)%\Java\jre6\bin\Java.exe"
-IF EXIST "%ProgramFiles%\Java\jre6\bin\Java.exe" SET JAVA="%ProgramFiles%\Java\jre6\bin\Java.exe"
+call ..\FindJava.bat
 
 cd ..\..\Tools\peter-bochs
 call GetPeterBochs.bat
 
-%JAVA% -jar peter-bochs-debugger.jar %BOCHS%\bochsdbg.exe -q -f %SETTINGS%\peter-bochsrc.bxrc
+%JAVABIN% -jar peter-bochs-debugger.jar %BOCHS%\bochsdbg.exe -q -f %SETTINGS%\peter-bochsrc.bxrc
diff --git a/Run/Bochs/bochsrc-pipe.bxrc b/Run/Bochs/bochsrc-pipe.bxrc
index d71416ac26..c3e3e6fa4c 100644
--- a/Run/Bochs/bochsrc-pipe.bxrc
+++ b/Run/Bochs/bochsrc-pipe.bxrc
@@ -30,3 +30,7 @@ log: bochsout.txt
 mouse: enabled=0
 
 com1: enabled=1, mode=pipe-client, dev=\\.\pipe\MOSA
+
+# enable sse
+cpuid: mmx=1, sep=1, sse=sse4_2, apic=xapic, aes=1, movbe=1, xsave=1
+
diff --git a/Run/Bochs/bochsrc.bxrc b/Run/Bochs/bochsrc.bxrc
index 28e0f06bc6..c86df25e41 100644
--- a/Run/Bochs/bochsrc.bxrc
+++ b/Run/Bochs/bochsrc.bxrc
@@ -28,3 +28,6 @@ log: bochsout.txt
 
 # disable the mouse, since DLX is text only
 mouse: enabled=0
+
+# enable sse
+cpuid: mmx=1, sep=1, sse=sse4_2, apic=xapic, aes=1, movbe=1, xsave=1
\ No newline at end of file
diff --git a/Run/Bochs/bochsrcdbg.bxrc b/Run/Bochs/bochsrcdbg.bxrc
index 4a239939d6..e6b334733e 100644
--- a/Run/Bochs/bochsrcdbg.bxrc
+++ b/Run/Bochs/bochsrcdbg.bxrc
@@ -29,3 +29,8 @@ log: bochsout.txt
 # disable the mouse, since DLX is text only
 mouse: enabled=0
 magic_break: enabled=1
+
+# enable sse
+cpuid: mmx=1, sep=1, sse=sse4_2, apic=xapic, aes=1, movbe=1, xsave=1
+
+
diff --git a/Run/Bochs/peter-bochsrc.bxrc b/Run/Bochs/peter-bochsrc.bxrc
index 849027ace6..cbe1708b1a 100644
--- a/Run/Bochs/peter-bochsrc.bxrc
+++ b/Run/Bochs/peter-bochsrc.bxrc
@@ -3,7 +3,7 @@
 ###############################################################
 
 # how much memory the emulated machine will have
-megs: 64
+megs: 128
 
 # filename of ROM images
 romimage: file=..\..\Tools\Bochs\BIOS-bochs-latest
@@ -28,3 +28,6 @@ log: bochsout.txt
 
 # disable the mouse, since DLX is text only
 mouse: enabled=0
+
+# enable sse
+cpuid: mmx=1, sep=1, sse=sse4_2, apic=xapic, aes=1, movbe=1, xsave=1
\ No newline at end of file
diff --git a/Run/Compile.bat b/Run/Compile.bat
index 222505738d..a4735aaac3 100644
--- a/Run/Compile.bat
+++ b/Run/Compile.bat
@@ -7,9 +7,11 @@ if exist build\main.exe del /q /f build\main.exe
 
 cd build
 
-..\..\bin\mosacl.exe -a=x86 -f=PE --pe-file-alignment=4096 --map=hello.map -b=mb0.7 -sa -ssa -o ..\build\main.exe ..\..\bin\%1
+..\..\bin\mosacl.exe -a=x86 -f=PE --pe-file-alignment=4096 --map=hello.map -b=mb0.7 -sa -ssa -o ..\build\main.exe ..\..\bin\%1 
 
 rem -mped=..\..\bin\output 
 
 cd ..
 
+CALL Disassemble.bat
+
diff --git a/Run/Compile.sh b/Run/Compile.sh
index 52cdd7a174..293f8e04e5 100755
--- a/Run/Compile.sh
+++ b/Run/Compile.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 [ -d build ] || mkdir build
 rm -f ./build/main.exe
-mono ../bin/mosacl.exe -a=x86 -f=PE -pe-file-alignment=4096 -b=mb0.7 -sa -ssa -o ./build/main.exe ../bin/$1
+mono ../bin/mosacl.exe -a=x86 -f=PE -b=mb0.7 -sa -ssa -o ./build/main.exe ../bin/$1
diff --git a/Run/FindJava.bat b/Run/FindJava.bat
new file mode 100644
index 0000000000..a19c08db4b
--- /dev/null
+++ b/Run/FindJava.bat
@@ -0,0 +1,11 @@
+IF EXIST "%ProgramFiles(x86)%\Java\jre6\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jre6\bin\java.exe"
+IF EXIST "%ProgramFiles%\Java\jre6\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jre6\bin\java.exe"
+
+IF EXIST "%ProgramFiles(x86)%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jre7\bin\java.exe"
+IF EXIST "%ProgramFiles%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jre7\bin\bin\java.exe"
+
+IF EXIST "%ProgramFiles(x86)%\Java\jdk1.7.0\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jdk1.7.0\bin\java.exe"
+IF EXIST "%ProgramFiles%\Java\jdk1.7.0\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jdk1.7.0\bin\java.exe"
+
+IF EXIST "%ProgramFiles(x86)%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jre7\bin\java.exe"
+IF EXIST "%ProgramFiles%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jre7\bin\java.exe"
diff --git a/Run/JPC/LaunchJPC.bat b/Run/JPC/LaunchJPC.bat
index 315fd990c6..0366471d95 100644
--- a/Run/JPC/LaunchJPC.bat
+++ b/Run/JPC/LaunchJPC.bat
@@ -1,15 +1,8 @@
+call ..\FindJava.bat
+
 cd ..\..\Tools\JPC
 call GetJPC.bat
 
-IF EXIST "%ProgramFiles(x86)%\Java\jre6\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jre6\bin\java.exe"
-IF EXIST "%ProgramFiles%\Java\jre6\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jre6\bin\java.exe"
-
-IF EXIST "%ProgramFiles(x86)%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jre7\bin\java.exe"
-IF EXIST "%ProgramFiles%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jre7\bin\bin\java.exe"
-
-IF EXIST "%ProgramFiles(x86)%\Java\jdk1.7.0\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jdk1.7.0\bin\java.exe"
-IF EXIST "%ProgramFiles%\Java\jdk1.7.0\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jdk1.7.0\bin\java.exe"
-
 %JAVABIN% -jar JPCApplication.jar -hda ..\..\Run\build\bootimage.img -boot hda
 
 pause
\ No newline at end of file
diff --git a/Run/JPC/LaunchJPCDebugger.bat b/Run/JPC/LaunchJPCDebugger.bat
index 8646221d0f..eb0924e04f 100644
--- a/Run/JPC/LaunchJPCDebugger.bat
+++ b/Run/JPC/LaunchJPCDebugger.bat
@@ -1,13 +1,6 @@
+call ..\FindJava.bat
+
 cd ..\..\Tools\JPC
 call GetJPC.bat
 
-IF EXIST "%ProgramFiles(x86)%\Java\jre6\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jre6\bin\java.exe"
-IF EXIST "%ProgramFiles%\Java\jre6\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jre6\bin\java.exe"
-
-IF EXIST "%ProgramFiles(x86)%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jre7\bin\java.exe"
-IF EXIST "%ProgramFiles%\Java\jre7\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jre7\bin\bin\java.exe"
-
-IF EXIST "%ProgramFiles(x86)%\Java\jdk1.7.0\bin\java.exe" SET JAVABIN="%ProgramFiles(x86)%\Java\jdk1.7.0\bin\java.exe"
-IF EXIST "%ProgramFiles%\Java\jdk1.7.0\bin\java.exe" SET JAVABIN="%ProgramFiles%\Java\jdk1.7.0\bin\java.exe"
-
 %JAVABIN% -jar JPCDebugger.jar -hda ..\..\Run\build\bootimage.img -boot hda
diff --git a/Run/Run-PeterBochs-Debugger.bat b/Run/Run-PeterBochs-Debugger.bat
new file mode 100644
index 0000000000..afe7dd2c23
--- /dev/null
+++ b/Run/Run-PeterBochs-Debugger.bat
@@ -0,0 +1,3 @@
+..\bin\Mosa.Tool.CreateBootImage.exe IMG\mosaboot-img.config build\bootimage.img
+cd Bochs
+call LaunchPeterBochsDebugger.bat
diff --git a/Run/Run-QEMU.bat b/Run/Run-QEMU.bat
index 07aff90516..44ff4340ca 100644
--- a/Run/Run-QEMU.bat
+++ b/Run/Run-QEMU.bat
@@ -1,3 +1,3 @@
 ..\bin\Mosa.Tool.CreateBootImage.exe IMG\mosaboot-img.config build\bootimage.img
 CD qemu
-CALL LaunchQemuWithServerTCP.bat
+CALL LaunchQemu.bat
diff --git a/Run/Run-QEMUWithTCP.bat b/Run/Run-QEMUWithTCP.bat
new file mode 100644
index 0000000000..07aff90516
--- /dev/null
+++ b/Run/Run-QEMUWithTCP.bat
@@ -0,0 +1,3 @@
+..\bin\Mosa.Tool.CreateBootImage.exe IMG\mosaboot-img.config build\bootimage.img
+CD qemu
+CALL LaunchQemuWithServerTCP.bat
diff --git a/Tools/Bochs/BIOS-bochs-latest b/Tools/Bochs/BIOS-bochs-latest
index 971560c29a..e8fae6f82c 100644
Binary files a/Tools/Bochs/BIOS-bochs-latest and b/Tools/Bochs/BIOS-bochs-latest differ
diff --git a/Tools/Bochs/VGABIOS-lgpl-latest b/Tools/Bochs/VGABIOS-lgpl-latest
index a6c56a569e..990f32afee 100644
Binary files a/Tools/Bochs/VGABIOS-lgpl-latest and b/Tools/Bochs/VGABIOS-lgpl-latest differ
diff --git a/Tools/Bochs/bochs.exe b/Tools/Bochs/bochs.exe
index 7f6fd8d93c..38b7b4d689 100644
Binary files a/Tools/Bochs/bochs.exe and b/Tools/Bochs/bochs.exe differ
diff --git a/Tools/Bochs/bochsdbg.exe b/Tools/Bochs/bochsdbg.exe
index e4b367f5f0..ec100b14e2 100644
Binary files a/Tools/Bochs/bochsdbg.exe and b/Tools/Bochs/bochsdbg.exe differ
diff --git a/Tools/Bochs/version.txt b/Tools/Bochs/version.txt
new file mode 100644
index 0000000000..dfe26b5d1b
--- /dev/null
+++ b/Tools/Bochs/version.txt
@@ -0,0 +1,2 @@
+2.6.1 [current]
+2.6.2 [doesn't work with peter-boch]
\ No newline at end of file
diff --git a/Tools/peter-bochs/jogl-natives-windows-i586.jar b/Tools/peter-bochs/jogl-natives-windows-i586.jar
new file mode 100644
index 0000000000..cd52eae2d7
Binary files /dev/null and b/Tools/peter-bochs/jogl-natives-windows-i586.jar differ
diff --git a/Tools/qemu/SDL.dll b/Tools/qemu/SDL.dll
index 781b54d6ee..628cdfcf01 100644
Binary files a/Tools/qemu/SDL.dll and b/Tools/qemu/SDL.dll differ
diff --git a/Tools/qemu/bios/bios.bin b/Tools/qemu/bios/bios.bin
index dc9b57ddc9..5734ae5d77 100644
Binary files a/Tools/qemu/bios/bios.bin and b/Tools/qemu/bios/bios.bin differ
diff --git a/Tools/qemu/libssp-0.dll b/Tools/qemu/libssp-0.dll
index 1af0918456..2125097146 100644
Binary files a/Tools/qemu/libssp-0.dll and b/Tools/qemu/libssp-0.dll differ
diff --git a/Tools/qemu/mgwz.dll b/Tools/qemu/mgwz.dll
new file mode 100644
index 0000000000..c7203cb27a
Binary files /dev/null and b/Tools/qemu/mgwz.dll differ
diff --git a/Tools/qemu/qemu-system-i386.exe b/Tools/qemu/qemu-system-i386.exe
new file mode 100644
index 0000000000..d9560ceaa9
Binary files /dev/null and b/Tools/qemu/qemu-system-i386.exe differ
diff --git a/Tools/qemu/qemu-system-i386w.exe b/Tools/qemu/qemu-system-i386w.exe
index c016c666ae..42526d4381 100644
Binary files a/Tools/qemu/qemu-system-i386w.exe and b/Tools/qemu/qemu-system-i386w.exe differ
diff --git a/Tools/sln2nant/sln2nant.bat b/Tools/sln2nant/sln2nant.bat
index e5f5fc35d8..2eb8bd541c 100644
--- a/Tools/sln2nant/sln2nant.bat
+++ b/Tools/sln2nant/sln2nant.bat
@@ -1 +1 @@
-ruby sln2nant.rb ../../Source/MOSA-VS2010.sln ../../Source/
+ruby sln2nant.rb ../../Source/MOSA-VS2012.sln ../../Source/
diff --git a/Tools/sln2nant/sln2nant.rb b/Tools/sln2nant/sln2nant.rb
index 4bc142701d..b145549654 100644
--- a/Tools/sln2nant/sln2nant.rb
+++ b/Tools/sln2nant/sln2nant.rb
@@ -18,7 +18,7 @@ def sln2nant(solutionFile)
         if values[1].end_with?(".csproj\"")
           cleaned = values[1].strip.tr('\"', '').tr('\\', '/').tr('//', '/')
           projectFile = @baseDir + cleaned
-          if (not projectFile.include? 'Test') or (projectFile.include? 'CodeDom') or (projectFile.include? 'Mosa.Test.Collection')
+          if (not projectFile.include? 'Mosa.Test.Compiler.Framework') and (not projectFile.include? 'Mosa.Test.Debug') 
             projectFiles << projectFile
             @buildfiles << cleaned[0..cleaned.rindex('/')] + 'mosa.build'
           end