diff --git a/Demos/AllBulletDemos/CMakeLists.txt b/Demos/AllBulletDemos/CMakeLists.txt
index a5a9bdce6..c308ac680 100644
--- a/Demos/AllBulletDemos/CMakeLists.txt
+++ b/Demos/AllBulletDemos/CMakeLists.txt
@@ -1,87 +1,99 @@
-# This is basically the overall name of the project in Visual Studio this is the name of the Solution File
-
-
-# For every executable you have with a main method you should have an add_executable line below.
-# For every add executable line you should list every .cpp and .h file you have associated with that executable.  
-
-
-# You shouldn't have to modify anything below this line 
-########################################################
-
-LINK_DIRECTORIES(
-"C:/MinGW/lib"
-)
-
-INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/Extras  
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACTUtils  
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition  
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML 
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include 
-${BULLET_PHYSICS_SOURCE_DIR}/src 
-${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
-${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
-)
-
-LINK_LIBRARIES(
-GLUI  GIMPACTUtils ConvexDecomposition OpenGLSupport  BulletWorldImporter BulletSoftBody BulletDynamics BulletCollision BulletFileLoader LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
-)
-
-SET(AllBulletDemos_SRCS
-	Main.cpp
-	DemoEntries.cpp
- 	 ../CcdPhysicsDemo/CcdPhysicsDemo.cpp
-   ../BasicDemo/BasicDemo.cpp
-	../BspDemo/BspDemo.cpp
-  ../BspDemo/BspConverter.cpp
-  ../BspDemo/BspLoader.cpp
-  ../DynamicControlDemo/MotorDemo.cpp
-  ../ConcaveDemo/ConcavePhysicsDemo.cpp
-  ../ConcaveRaycastDemo/ConcaveRaycastDemo.cpp
-  ../ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp
-  ../ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
-  ../SliderConstraintDemo/SliderConstraintDemo.cpp
-	../RagdollDemo/RagdollDemo.cpp
-  ../GimpactTestDemo/GimpactTestDemo.cpp
-  ../Raytracer/Raytracer.cpp
-  ../GjkConvexCastDemo/LinearConvexCastDemo.cpp
-  ../ForkLiftDemo/ForkLiftDemo.cpp
-  ../SoftDemo/SoftDemo.cpp
-  ../ConstraintDemo/ConstraintDemo.cpp
-)
-
-IF (WIN32)
-	ADD_EXECUTABLE(AppAllBulletDemos
-		${AllBulletDemos_SRCS}
-		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
-	)
-ELSE()
-	ADD_EXECUTABLE(AppAllBulletDemos
-		${AllBulletDemos_SRCS}
-	)
-ENDIF()
-
-
-IF (WIN32)
-	IF (NOT INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
-		IF (CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppAllBulletDemos
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ELSE(CMAKE_CL_64)
-			ADD_CUSTOM_COMMAND(
-				TARGET AppAllBulletDemos
-				POST_BUILD
-				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
-			)
-		ENDIF(CMAKE_CL_64)
-	ENDIF (NOT INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
-ENDIF(WIN32)
-
-
+# This is basically the overall name of the project in Visual Studio this is the name of the Solution File
+
+
+# For every executable you have with a main method you should have an add_executable line below.
+# For every add executable line you should list every .cpp and .h file you have associated with that executable.  
+
+
+# You shouldn't have to modify anything below this line 
+########################################################
+
+LINK_DIRECTORIES(
+"C:/MinGW/lib"
+)
+
+INCLUDE_DIRECTORIES(
+${BULLET_PHYSICS_SOURCE_DIR}/Extras  
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/GIMPACTUtils  
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition  
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML 
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/LibXML/include 
+${BULLET_PHYSICS_SOURCE_DIR}/src 
+${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL 
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
+${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
+)
+
+LINK_LIBRARIES(
+GLUI  GIMPACTUtils ConvexDecomposition OpenGLSupport  BulletWorldImporter BulletSoftBody BulletDynamics BulletCollision BulletFileLoader LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+)
+
+SET(AllBulletDemos_SRCS
+	Main.cpp
+	DemoEntries.cpp
+ 	 ../CcdPhysicsDemo/CcdPhysicsDemo.cpp
+   ../BasicDemo/BasicDemo.cpp
+	../BspDemo/BspDemo.cpp
+  ../BspDemo/BspConverter.cpp
+  ../BspDemo/BspLoader.cpp
+  ../DynamicControlDemo/MotorDemo.cpp
+  ../ConcaveDemo/ConcavePhysicsDemo.cpp
+  ../ConcaveRaycastDemo/ConcaveRaycastDemo.cpp
+  ../ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp
+  ../ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
+  ../SliderConstraintDemo/SliderConstraintDemo.cpp
+	../RagdollDemo/RagdollDemo.cpp
+  ../GimpactTestDemo/GimpactTestDemo.cpp
+  ../Raytracer/Raytracer.cpp
+  ../GjkConvexCastDemo/LinearConvexCastDemo.cpp
+  ../ForkLiftDemo/ForkLiftDemo.cpp
+  ../SoftDemo/SoftDemo.cpp
+  ../ConstraintDemo/ConstraintDemo.cpp
+)
+
+IF (WIN32)
+	ADD_EXECUTABLE(AppAllBulletDemos
+		${AllBulletDemos_SRCS}
+		${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+	)
+ELSE()
+	ADD_EXECUTABLE(AppAllBulletDemos
+		${AllBulletDemos_SRCS}
+	)
+ENDIF()
+
+
+IF (WIN32)
+	IF (NOT INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
+		IF (CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppAllBulletDemos
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/glut64.dll ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ELSE(CMAKE_CL_64)
+			ADD_CUSTOM_COMMAND(
+				TARGET AppAllBulletDemos
+				POST_BUILD
+				COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/GLUT32.DLL ${CMAKE_CURRENT_BINARY_DIR}
+			)
+		ENDIF(CMAKE_CL_64)
+	ENDIF (NOT INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
+ENDIF(WIN32)
+
+
+IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+	ADD_CUSTOM_COMMAND(
+	TARGET AppAllBulletDemos
+	POST_BUILD
+	COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/testFileOriginal.bullet  ${CMAKE_CURRENT_BINARY_DIR}/testFile32Single.bullet
+	COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/file.obj ${CMAKE_CURRENT_BINARY_DIR}
+	)
+ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
+
+
+
+
 IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
 	SET_TARGET_PROPERTIES(AppAllBulletDemos PROPERTIES  DEBUG_POSTFIX "_Debug")
 	SET_TARGET_PROPERTIES(AppAllBulletDemos PROPERTIES  MINSIZEREL_POSTFIX "_MinsizeRel")
diff --git a/Demos/Benchmarks/main.cpp b/Demos/Benchmarks/main.cpp
index b6b21bbaf..412f08b20 100644
--- a/Demos/Benchmarks/main.cpp
+++ b/Demos/Benchmarks/main.cpp
@@ -51,7 +51,6 @@ int main(int argc,char** argv)
 	benchmarkDemo.initPhysics();
 	benchmarkDemo.getDynamicsWorld()->setDebugDrawer(&gDebugDrawer);
 	benchmarkDemo.setDebugMode(benchmarkDemo.getDebugMode() | btIDebugDraw::DBG_NoDeactivation);
-	setDefaultContactProcessingThreshold(0.f);
 	return glutmain(argc, argv,640,480,"Bullet Physics Demo. http://bulletphysics.com",&benchmarkDemo);
 
 #else //USE_GRAPHICAL_BENCHMARK