diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index 2addb23d65..d6320fef24 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -10,7 +10,8 @@ StepMania 5.0 $NEXT | 20110xyy
 
 2011/05/10
 ----------
-* [Sprite] Added SetSecondsIntoAnimation(float) Lua binding. [AJ]
+* [Sprite] Added SetSecondsIntoAnimation Lua binding. [AJ]
+* [BPMDisplay] Added SetFromCourse Lua binding. [AJ]
 
 2011/05/03
 ----------
diff --git a/Themes/_fallback/Graphics/Banner Endless.redir b/Themes/_fallback/Graphics/Banner Endless.redir
new file mode 100644
index 0000000000..507050cda9
--- /dev/null
+++ b/Themes/_fallback/Graphics/Banner Endless.redir	
@@ -0,0 +1 @@
+Common fallback banner
\ No newline at end of file
diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index 51db471be3..d0492d5a94 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -1889,6 +1889,10 @@ Modifier=Modifier
 Obtain an updated driver from your video card manufacturer.=Obtain an updated driver from your video card manufacturer.
 GLDirect was detected.  GLDirect is not compatible with this game and should be disabled.=GLDirect was detected.  GLDirect is not compatible with this game and should be disabled.
 
+[RageDisplay_D3D]
+DirectX 8.1 or greater is not installed.  You can download it from:=DirectX 8.1 or greater is not installed.  You can download it from:
+Your system is reporting that Direct3D hardware acceleration is not available.  Please obtain an updated driver from your video card manufacturer.=Your system is reporting that Direct3D hardware acceleration is not available.  Please obtain an updated driver from your video card manufacturer.
+
 [RageDisplay]
 SetVideoMode failed:=SetVideoMode failed:
 
diff --git a/Themes/_fallback/Scripts/04 Scoring.lua b/Themes/_fallback/Scripts/04 Scoring.lua
index b6d68abb9c..1c8c8df8b5 100644
--- a/Themes/_fallback/Scripts/04 Scoring.lua	
+++ b/Themes/_fallback/Scripts/04 Scoring.lua	
@@ -8,10 +8,11 @@ local ZeroIfNotFound = { __index = function() return 0 end; };
 
 -- Retrieve the amount of taps/holds/rolls involved. Used for some formulas.
 function GetTotalItems(radars)
-	return radars:GetValue('RadarCategory_TapsAndHolds') 
-		+ radars:GetValue('RadarCategory_Holds') 
-		+ radars:GetValue('RadarCategory_Rolls');
-		+ radars:GetValue('RadarCategory_Lifts');
+	local total = radars:GetValue('RadarCategory_TapsAndHolds')
+	total = total + radars:GetValue('RadarCategory_Holds') 
+	total = total + radars:GetValue('RadarCategory_Rolls')
+	total = total + radars:GetValue('RadarCategory_Lifts')
+	return total
 end;
 
 -- Determine whether marvelous timing is to be considered.
diff --git a/src/BPMDisplay.cpp b/src/BPMDisplay.cpp
index bf4b8b15c2..e15a347fbe 100644
--- a/src/BPMDisplay.cpp
+++ b/src/BPMDisplay.cpp
@@ -204,7 +204,8 @@ void BPMDisplay::SetBpmFromCourse( const Course* pCourse )
 
 	StepsType st = GAMESTATE->GetCurrentStyle()->m_StepsType;
 	Trail *pTrail = pCourse->GetTrail( st );
-	ASSERT( pTrail );
+	// GetTranslitFullTitle because "Crashinfo.txt is garbled because of the ANSI output as usual." -f
+	ASSERT_M( pTrail, ssprintf("Course '%s' has no trail for StepsType '%s'", pCourse->GetTranslitFullTitle(), StringConversion::ToString(st).c_str() ) );
 
 	m_fCycleTime = 0.2f;
 
@@ -304,12 +305,23 @@ public:
 		}
 		return 0;
 	}
+	static int SetFromCourse( T* p, lua_State *L )
+	{
+		if( lua_isnil(L,1) ) { p->NoBPM(); }
+		else
+		{
+			const Course* pCourse = Luna<Course>::check( L, 1, true );
+			p->SetBpmFromCourse(pCourse);
+		}
+		return 0;
+	}
 	static int GetText( T* p, lua_State *L )		{ lua_pushstring( L, p->GetText() ); return 1; }
 
 	LunaBPMDisplay()
 	{
 		ADD_METHOD( SetFromGameState );
 		ADD_METHOD( SetFromSong );
+		ADD_METHOD( SetFromCourse );
 		ADD_METHOD( GetText );
 	}
 };
diff --git a/src/JsonUtil.cpp b/src/JsonUtil.cpp
index e7eb597e21..be736ea4b5 100644
--- a/src/JsonUtil.cpp
+++ b/src/JsonUtil.cpp
@@ -4,8 +4,8 @@
 #include "RageUtil.h"
 #include "RageLog.h"
 #include "arch/Dialog/Dialog.h"
-#include "../extern/jsoncpp/include/json/reader.h"
-#include "../extern/jsoncpp/include/json/writer.h"
+#include "json/reader.h"
+#include "json/writer.h"
 
 bool JsonUtil::LoadFromString(Json::Value &root, RString sData, RString &sErrorOut)
 {