diff --git a/stepmania/Themes/default/Graphics/ScreenSelectStyle joint premium.png b/stepmania/Themes/default/Graphics/ScreenSelectStyle joint premium.png
new file mode 100644
index 0000000000..0b31d6fefc
Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenSelectStyle joint premium.png differ
diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 62a458d89c..5679c27f6a 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -35,8 +35,8 @@ ZoomSelected=1.3
 SecondsBetweenComments=12
 SecondsBeforeAttract=30
 HelpTextHome=Use &UP; &DOWN; to select, then press START
-HelpTextPay=Press START to join in.
-HelpTextFree=Press START to join in.
+HelpTextPay=Press START to begin.
+HelpTextFree=Press START to begin.
 NextScreen=ScreenCaution
 
 [ScreenCaution]
@@ -67,7 +67,7 @@ NextScreen2=ScreenSelectDifficulty
 NextScreen3=ScreenSelectDifficulty
 NextScreen4=ScreenSelectDifficulty
 NextScreen5=ScreenSelectDifficulty
-JointPremiumOnCommand=x,550;y,400;xoffset,400;bounceend,0.5;xoffset,-400
+JointPremiumOnCommand=x,550;y,84;xoffset,400;bounceend,0.5;xoffset,-400;glowshift
 JointPremiumOffCommand=bouncebegin,0.5;xoffset,400
 Icon1OnCommand=x,60;y,84;xoffset,-800;sleep,0.20;decelerate,0.4;xoffset,800
 Icon1OffCommand=bouncebegin,0.5;zoomy,0
diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp
index 35de58c373..1bcaffd1ab 100644
--- a/stepmania/src/BGAnimationLayer.cpp
+++ b/stepmania/src/BGAnimationLayer.cpp
@@ -81,12 +81,12 @@ void BGAnimationLayer::Init()
 	m_fOverrideSpeed = 0;
 	m_iNumParticles = 10;
 	m_bParticlesBounce = false;
-	m_iNumTilesWide = 10;
-	m_iNumTilesHigh = 8;
+	m_iNumTilesWide = -1;
+	m_iNumTilesHigh = -1;
 	m_fTilesStartX = 0;
 	m_fTilesStartY = 0;
-	m_fTilesSpacingX = 64;
-	m_fTilesSpacingY = 64;
+	m_fTilesSpacingX = -1;
+	m_fTilesSpacingY = -1;
 	m_fTileVelocityX = 0;
 	m_fTileVelocityY = 0;
 
@@ -482,8 +482,8 @@ void BGAnimationLayer::LoadFromIni( CString sAniDir, CString sLayer, CString sSo
 	ini.GetValueF( sLayer, "OverrideSpeed", m_fOverrideSpeed );
 	ini.GetValueI( sLayer, "NumParticles", m_iNumParticles );
 	ini.GetValueB( sLayer, "ParticlesBounce", m_bParticlesBounce );
-	ini.GetValueI( sLayer, "NumTilesWide", m_iNumTilesWide );
-	ini.GetValueI( sLayer, "NumTilesHigh", m_iNumTilesHigh );
+//	ini.GetValueI( sLayer, "NumTilesWide", m_iNumTilesWide );	// infer from spacing (or else the Update logic breaks)
+//	ini.GetValueI( sLayer, "NumTilesHigh", m_iNumTilesHigh );	// infer from spacing (or else the Update logic breaks)
 	ini.GetValueF( sLayer, "TilesStartX", m_fTilesStartX );
 	ini.GetValueF( sLayer, "TilesStartY", m_fTilesStartY );
 	ini.GetValueF( sLayer, "TilesSpacingX", m_fTilesSpacingX );
@@ -531,6 +531,17 @@ void BGAnimationLayer::LoadFromIni( CString sAniDir, CString sLayer, CString sSo
 		break;
 	case TYPE_TILES:
 		{
+			m_Sprites[0].Load( sPath );
+			if( m_fTilesSpacingX == -1 )
+			{
+				m_fTilesSpacingX = m_Sprites[0].GetUnzoomedWidth();
+				m_fTilesSpacingX -= 1;
+			}
+			if( m_fTilesSpacingY == -1 )
+			{
+				m_fTilesSpacingY = m_Sprites[0].GetUnzoomedHeight();
+				m_fTilesSpacingY -= 1;
+			}
 			m_iNumTilesWide = 2+(int)(SCREEN_WIDTH /m_fTilesSpacingX);
 			m_iNumTilesHigh = 2+(int)(SCREEN_HEIGHT/m_fTilesSpacingY);
 			m_iNumSprites = m_iNumTilesWide * m_iNumTilesHigh;
diff --git a/stepmania/src/ScreenCaution.cpp b/stepmania/src/ScreenCaution.cpp
index f3e8a22b73..23e20bcc8a 100644
--- a/stepmania/src/ScreenCaution.cpp
+++ b/stepmania/src/ScreenCaution.cpp
@@ -92,7 +92,7 @@ void ScreenCaution::MenuStart( PlayerNumber pn )
 
 void ScreenCaution::MenuBack( PlayerNumber pn )
 {
-	if( m_In.IsTransitioning() || m_Out.IsTransitioning() )
+	if( m_In.IsTransitioning() || m_Out.IsTransitioning() || m_Back.IsTransitioning() )
 		return;
 	this->ClearMessageQueue();
 	m_Back.StartTransitioning( SM_GoToPrevScreen );