diff --git a/Core/MIPS/MIPSVFPUUtils.cpp b/Core/MIPS/MIPSVFPUUtils.cpp
index 5c1b35fffb..7d99dde262 100644
--- a/Core/MIPS/MIPSVFPUUtils.cpp
+++ b/Core/MIPS/MIPSVFPUUtils.cpp
@@ -307,7 +307,7 @@ VectorSize GetHalfVectorSize(VectorSize sz) {
 	switch (sz) {
 	case V_Pair: return V_Single;
 	case V_Quad: return V_Pair;
-	default: _assert_msg_(JIT, 0, "%s: Bad vector size", __FUNCTION__); return V_Invalid;
+	default: /*_assert_msg_(JIT, 0, "%s: Bad vector size", __FUNCTION__);*/ return V_Invalid;
 	}
 }
 
@@ -317,7 +317,7 @@ VectorSize GetDoubleVectorSize(VectorSize sz)
 	{
 	case V_Single: return V_Pair;
 	case V_Pair: return V_Quad;
-	default: _assert_msg_(JIT, 0, "%s: Bad vector size", __FUNCTION__); return V_Invalid;
+	default: /*_assert_msg_(JIT, 0, "%s: Bad vector size", __FUNCTION__);*/ return V_Invalid;
 	}
 }
 
@@ -332,7 +332,7 @@ VectorSize GetVecSize(MIPSOpcode op)
 		case 1: return V_Pair;
 		case 2: return V_Triple;
 		case 3: return V_Quad;
-		default: _assert_msg_(JIT, 0, "%s: Bad vector size", __FUNCTION__); return V_Invalid;
+		default: /*_assert_msg_(JIT, 0, "%s: Bad vector size", __FUNCTION__);*/ return V_Invalid;
 	}
 }
 
@@ -341,7 +341,7 @@ VectorSize GetVectorSize(MatrixSize sz) {
 	case M_2x2: return V_Pair;
 	case M_3x3: return V_Triple;
 	case M_4x4: return V_Quad;
-	default: _assert_msg_(JIT, 0, "%s: Bad vector size", __FUNCTION__); return V_Invalid;
+	default: /*_assert_msg_(JIT, 0, "%s: Bad vector size", __FUNCTION__);*/ return V_Invalid;
 	}
 }
 
@@ -351,7 +351,7 @@ MatrixSize GetMatrixSize(VectorSize sz) {
 	case V_Pair: return M_2x2;
 	case V_Triple: return M_3x3;
 	case V_Quad: return M_4x4;
-	default: _assert_msg_(JIT, 0, "%s: Bad vector size", __FUNCTION__); return M_Invalid;
+	default: /*_assert_msg_(JIT, 0, "%s: Bad vector size", __FUNCTION__);*/ return M_Invalid;
 	}
 }
 
@@ -364,7 +364,7 @@ MatrixSize GetMtxSize(MIPSOpcode op) {
 	case 1: return M_2x2;
 	case 2: return M_3x3;
 	case 3: return M_4x4;
-	default: _assert_msg_(JIT, 0, "%s: Bad matrix size", __FUNCTION__); return M_Invalid;
+	default: /*_assert_msg_(JIT, 0, "%s: Bad matrix size", __FUNCTION__);*/ return M_Invalid;
 	}
 }
 
@@ -373,7 +373,7 @@ VectorSize MatrixVectorSize(MatrixSize sz) {
 	case M_2x2: return V_Pair;
 	case M_3x3: return V_Triple;
 	case M_4x4: return V_Quad;
-	default: _assert_msg_(JIT, 0, "%s: Bad matrix size", __FUNCTION__); return V_Invalid;
+	default: /*_assert_msg_(JIT, 0, "%s: Bad matrix size", __FUNCTION__);*/ return V_Invalid;
 	}
 }
 
@@ -382,7 +382,7 @@ int GetMatrixSide(MatrixSize sz) {
 	case M_2x2: return 2;
 	case M_3x3: return 3;
 	case M_4x4: return 4;
-	default: _assert_msg_(JIT, 0, "%s: Bad matrix size", __FUNCTION__); return 0;
+	default: /*_assert_msg_(JIT, 0, "%s: Bad matrix size", __FUNCTION__);*/ return 0;
 	}
 }
 
diff --git a/README.md b/README.md
index 7d58d2d59e..a4586435c7 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 The aim of this hackish branch is to:
  - hackfix stuff that might never get fixed because it's a regression to an unpopular game caused by a fix to popular one etc,
  - add my workaround cheat.db as a submodule to distinguish cheats and patches on importing,
- - more compat.ini hacks to easier test rare games against known problems and regressions.
+ - more compat.ini hacks to easier test rare games against known problems and regressions,
+ - merge some wip stuff,
+ - customize stuff to my preference and be completely free with experimenting.
 
 
 
diff --git a/Windows/EmuThread.cpp b/Windows/EmuThread.cpp
index 28626ae301..0dac8c9df1 100644
--- a/Windows/EmuThread.cpp
+++ b/Windows/EmuThread.cpp
@@ -70,7 +70,7 @@ void EmuThread_Stop()
 	Core_WaitInactive(800);
 	if (WAIT_TIMEOUT == WaitForSingleObject(emuThread, 800))
 	{
-		_dbg_assert_msg_(COMMON, false, "Wait for EmuThread timed out.");
+		//_dbg_assert_msg_(COMMON, false, "Wait for EmuThread timed out.");
 	}
 	{
 		std::lock_guard<std::mutex> guard(emuThreadLock);