diff --git a/GameSettings.cpp b/GameSettings.cpp
index adf13438..07172c2b 100644
--- a/GameSettings.cpp
+++ b/GameSettings.cpp
@@ -948,6 +948,9 @@ void LoadGameExternalOptions()
 	gGameExternalOptions.giMilitiaTurnSpeedUpFactor		= iniReader.ReadFloat("Graphics Settings","MILITIA_TURN_SPEED_UP_FACTOR",1.0, 0, 1.0);
 	gGameExternalOptions.giCivilianTurnSpeedUpFactor	= iniReader.ReadFloat("Graphics Settings","CIVILIAN_TURN_SPEED_UP_FACTOR",1.0, 0, 1.0);
 
+	gGameExternalOptions.fScrollSpeedFactor					= iniReader.ReadFloat("Graphics Settings","SCROLL_SPEED_FACTOR",1.0, 0.5, 2.0);
+	giTimerIntervals[ NEXTSCROLL ] = (INT16)(giTimerIntervals[ NEXTSCROLL ] / gGameExternalOptions.fScrollSpeedFactor);
+
 	gGameExternalOptions.gfUseExternalLoadscreens		= iniReader.ReadBoolean("Graphics Settings","USE_EXTERNALIZED_LOADSCREENS", FALSE);
 	
 	if (!is_networked)
diff --git a/GameSettings.h b/GameSettings.h
index 591b28ad..a1f610ed 100644
--- a/GameSettings.h
+++ b/GameSettings.h
@@ -461,6 +461,7 @@ typedef struct
 	FLOAT giCreatureTurnSpeedUpFactor;
 	FLOAT giMilitiaTurnSpeedUpFactor;
 	FLOAT giCivilianTurnSpeedUpFactor;
+	FLOAT fScrollSpeedFactor;
 
 	//Sound settings
 	UINT32 guiWeaponSoundEffectsVolume;
diff --git a/GameVersion.cpp b/GameVersion.cpp
index 051f2654..674d4530 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -15,9 +15,9 @@
 #ifdef JA2EDITOR
 	
 	#ifdef JA2UB
-		CHAR16 zVersionLabel[256]		= { L"Unfinished Business - Map Editor v1.13.8292 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Unfinished Business - Map Editor v1.13.8295 (Development Build)" }; 
 	#else
-		CHAR16 zVersionLabel[256]		= { L"Map Editor v1.13.8292 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Map Editor v1.13.8295 (Development Build)" }; 
 	#endif
 
 // ------------------------------
@@ -27,11 +27,11 @@
 
 	//DEBUG BUILD VERSION	
 	#ifdef JA2UB
-		CHAR16 zVersionLabel[256]		= { L"Debug: Unfinished Business - v1.13.8292 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Debug: Unfinished Business - v1.13.8295 (Development Build)" }; 
 	#elif defined (JA113DEMO)
-		CHAR16 zVersionLabel[256]		= { L"Debug: JA2 Demo - v1.13.8292 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Debug: JA2 Demo - v1.13.8295 (Development Build)" }; 
 	#else
-		CHAR16 zVersionLabel[256]		= { L"Debug: v1.13.8292 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Debug: v1.13.8295 (Development Build)" }; 
 	#endif
 
 #elif defined CRIPPLED_VERSION
@@ -46,16 +46,16 @@
 
 	//RELEASE BUILD VERSION	
 	#ifdef JA2UB
-		CHAR16		zVersionLabel[256]		= { L"Release Unfinished Business - v1.13.8292 (Development Build)" };
+		CHAR16		zVersionLabel[256]		= { L"Release Unfinished Business - v1.13.8295 (Development Build)" };
 	#elif defined (JA113DEMO)
-		CHAR16		zVersionLabel[256]		= { L"Release JA2 Demo - v1.13.8292 (Development Build)" };
+		CHAR16		zVersionLabel[256]		= { L"Release JA2 Demo - v1.13.8295 (Development Build)" };
 	#else
-		CHAR16		zVersionLabel[256]		= { L"Release v1.13.8292 (Development Build)" };
+		CHAR16		zVersionLabel[256]		= { L"Release v1.13.8295 (Development Build)" };
 	#endif
 
 #endif
 										
-CHAR8		czVersionNumber[16]	= { "Build 16.09.03" };		//YY.MM.DD
+CHAR8		czVersionNumber[16]	= { "Build 16.09.11" };		//YY.MM.DD
 CHAR16		zTrackingNumber[16]	= { L"Z" };
 	
 // SAVE_GAME_VERSION is defined in header, change it there
diff --git a/Strategic/Strategic Movement Costs.cpp b/Strategic/Strategic Movement Costs.cpp
index 8a7f8b4a..828b1db8 100644
--- a/Strategic/Strategic Movement Costs.cpp	
+++ b/Strategic/Strategic Movement Costs.cpp	
@@ -257,6 +257,10 @@ smctableEndElementHandle(void *userData, const XML_Char *name)
 			{
 				trav_type = HILLS;
 			}
+			else if(strcmp(pData->szCharData, "GROUNDBARRIER") == 0)
+			{
+				trav_type = GROUNDBARRIER;
+			}
 			else if(strcmp(pData->szCharData, "NS_RIVER") == 0)
 			{
 				trav_type = NS_RIVER;
@@ -319,7 +323,9 @@ smctableEndElementHandle(void *userData, const XML_Char *name)
 			}
 			else
 			{
-				trav_type = GROUNDBARRIER;
+				// silversurfer: don't just assign type GROUNDBARRIER. Let modders know that the data is incorrect!
+				AssertMsg(0, String( "Incorrect traversal data '%s' for sector row=%d column=%d !", pData->szCharData, pData->uiRowNumber, pData->uiColNumber) );
+				//trav_type = GROUNDBARRIER;
 			}
 			// Now assign it to the correct directory using the close tag as a guide
 			if(strcmp(name, "North") == 0)
diff --git a/TileEngine/renderworld.cpp b/TileEngine/renderworld.cpp
index f90bf383..413fe50f 100644
--- a/TileEngine/renderworld.cpp
+++ b/TileEngine/renderworld.cpp
@@ -3599,41 +3599,41 @@ void ScrollWorld( )
 			// Check for sliding			
 			if (!TileIsOutOfBounds(gTacticalStatus.sSlideTarget))
 			{
-				 // Ignore all input...
-				 // Check if we have reached out dest!
-         if ( fFirstTimeInSlideToMode )
-         {
-           ubOldScrollSpeed = gubCurScrollSpeedID;
-           fFirstTimeInSlideToMode = FALSE;
-         }
+				// Ignore all input...
+				// Check if we have reached out dest!
+				if ( fFirstTimeInSlideToMode )
+				{
+					ubOldScrollSpeed = gubCurScrollSpeedID;
+					fFirstTimeInSlideToMode = FALSE;
+				}
 
-         // Make faster!
-         //gubCurScrollSpeedID = 2;
+				// Make faster!
+				//gubCurScrollSpeedID = 2;
 
-				 ScrollFlags = 0;
-				 fDoScroll = FALSE;
-				 //
-				 if ( SoldierLocationRelativeToScreen( gTacticalStatus.sSlideTarget, gTacticalStatus.sSlideReason, &bDirection, &ScrollFlags ) && GridNoOnVisibleWorldTile( gTacticalStatus.sSlideTarget ) )
-				 {
-						ScrollFlags = gScrollDirectionFlags[ bDirection ];
-						fDoScroll			= TRUE;
-						fIgnoreInput	= TRUE;
-				 }
-				 else
-				 {
-						// We've stopped!
-						gTacticalStatus.sSlideTarget = NOWHERE;
-				 }
+				ScrollFlags = 0;
+				fDoScroll = FALSE;
+				//
+				if ( SoldierLocationRelativeToScreen( gTacticalStatus.sSlideTarget, gTacticalStatus.sSlideReason, &bDirection, &ScrollFlags ) && GridNoOnVisibleWorldTile( gTacticalStatus.sSlideTarget ) )
+				{
+					ScrollFlags = gScrollDirectionFlags[ bDirection ];
+					fDoScroll			= TRUE;
+					fIgnoreInput	= TRUE;
+				}
+				else
+				{
+					// We've stopped!
+					gTacticalStatus.sSlideTarget = NOWHERE;
+				}
+			}
+			else
+			{
+				// Restore old scroll speed
+				if ( !fFirstTimeInSlideToMode )
+				{
+					gubCurScrollSpeedID = ubOldScrollSpeed;
+				}
+				fFirstTimeInSlideToMode = TRUE;
 			}
-      else
-      {
-        // Restore old scroll speed
-        if ( !fFirstTimeInSlideToMode )
-        {
-          gubCurScrollSpeedID = ubOldScrollSpeed;
-        }
-        fFirstTimeInSlideToMode = TRUE;
-      }
 		}
 
 		if ( !fIgnoreInput )