diff --git a/Detour/Source/DetourNavMesh.cpp b/Detour/Source/DetourNavMesh.cpp
index 8acfd5d..005ce81 100644
--- a/Detour/Source/DetourNavMesh.cpp
+++ b/Detour/Source/DetourNavMesh.cpp
@@ -567,7 +567,7 @@ bool dtNavMesh::closestPointOnPoly(dtPolyRef ref, const float* pos, float* close
 {
 	unsigned int salt, it, ip;
 	dtDecodePolyId(ref, salt, it, ip);
-	if (it >= m_maxTiles) return false;
+	if (it >= (unsigned int)m_maxTiles) return false;
 	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return false;
 	const dtMeshHeader* header = m_tiles[it].header;
 
@@ -605,7 +605,7 @@ bool dtNavMesh::closestPointOnPolyBoundary(dtPolyRef ref, const float* pos, floa
 {
 	unsigned int salt, it, ip;
 	dtDecodePolyId(ref, salt, it, ip);
-	if (it >= m_maxTiles) return false;
+	if (it >= (unsigned int)m_maxTiles) return false;
 	if (m_tiles[it].salt != salt || m_tiles[it].header == 0) return false;
 	const dtMeshHeader* header = m_tiles[it].header;
 	
diff --git a/Recast/Source/RecastDebugDraw.cpp b/Recast/Source/RecastDebugDraw.cpp
index 1a42ceb..0dbb76a 100644
--- a/Recast/Source/RecastDebugDraw.cpp
+++ b/Recast/Source/RecastDebugDraw.cpp
@@ -888,7 +888,7 @@ void rcDebugDrawPolyMeshDetail(rcDebugDraw* dd, const struct rcPolyMeshDetail& d
 	dd->end();
 	
 	// External edges.
-	dd->begin(RC_DRAW_LINES, 2.0f);
+	dd->begin(RC_DRAW_LINES, nve, 2.0f);
 	const unsigned int cole = RGBA(0,0,0,64);
 	for (int i = 0; i < dmesh.nmeshes; ++i)
 	{
diff --git a/Recast/Source/RecastRegion.cpp b/Recast/Source/RecastRegion.cpp
index 3dfde02..59fb989 100644
--- a/Recast/Source/RecastRegion.cpp
+++ b/Recast/Source/RecastRegion.cpp
@@ -1052,7 +1052,7 @@ bool rcBuildRegionsMonotone(rcCompactHeightfield& chf,
 					const int ai = (int)chf.cells[ax+ay*w].index + rcGetCon(s, 3);
 					if (srcReg[ai] && (srcReg[ai] & RC_BORDER_REG) == 0)
 					{
-						unsigned char nr = srcReg[ai];
+						unsigned short nr = srcReg[ai];
 						if (!sweeps[previd].nei || sweeps[previd].nei == nr)
 						{
 							sweeps[previd].nei = nr;
diff --git a/RecastDemo/Bin/Recast.exe b/RecastDemo/Bin/Recast.exe
index 079bc09..7d3a0ad 100644
Binary files a/RecastDemo/Bin/Recast.exe and b/RecastDemo/Bin/Recast.exe differ
diff --git a/RecastDemo/Build/VC9/Recast.vcproj b/RecastDemo/Build/VC9/Recast.vcproj
index b992bdd..6a78781 100644
--- a/RecastDemo/Build/VC9/Recast.vcproj
+++ b/RecastDemo/Build/VC9/Recast.vcproj
@@ -259,6 +259,14 @@
 					RelativePath="..\..\..\Detour\Include\DetourDebugDraw.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\Detour\Include\DetourNavMesh.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Detour\Include\DetourNavMeshBuilder.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\..\Detour\Include\DetourNode.h"
 					>
@@ -291,6 +299,14 @@
 					RelativePath="..\..\..\Detour\Source\DetourDebugDraw.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\Detour\Source\DetourNavMesh.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Detour\Source\DetourNavMeshBuilder.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\..\..\Detour\Source\DetourNode.cpp"
 					>
@@ -340,15 +356,19 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\Include\Sample_StatMesh.h"
+					RelativePath="..\..\Include\Sample_DynMesh.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\Include\Sample_StatMeshSimple.h"
+					RelativePath="..\..\Include\Sample_SoloMesh.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\Include\Sample_StatMeshTiled.h"
+					RelativePath="..\..\Include\Sample_SoloMeshSimple.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Include\Sample_SoloMeshTiled.h"
 					>
 				</File>
 				<File
@@ -388,15 +408,19 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\Source\Sample_StatMesh.cpp"
+					RelativePath="..\..\Source\Sample_DynMesh.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\Source\Sample_StatMeshSimple.cpp"
+					RelativePath="..\..\Source\Sample_SoloMesh.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\Source\Sample_StatMeshTiled.cpp"
+					RelativePath="..\..\Source\Sample_SoloMeshSimple.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Source\Sample_SoloMeshTiled.cpp"
 					>
 				</File>
 				<File