diff --git a/stepmania/src/ScreenNameEntry.cpp b/stepmania/src/ScreenNameEntry.cpp
index f64b3bae04..59d61e1459 100644
--- a/stepmania/src/ScreenNameEntry.cpp
+++ b/stepmania/src/ScreenNameEntry.cpp
@@ -90,7 +90,7 @@ ScreenNameEntry::ScreenNameEntry()
 {
 	LOG->Trace( "ScreenNameEntry::ScreenNameEntry()" );
 
-	
+
 	// update cache
 	g_fCharsZoomSmall = CHARS_ZOOM_SMALL;
 	g_fCharsZoomLarge = CHARS_ZOOM_LARGE;
@@ -116,6 +116,10 @@ ScreenNameEntry::ScreenNameEntry()
 
 
 
+	// reset Player and Song Options
+	for( int p=0; p<NUM_PLAYERS; p++ )
+		GAMESTATE->m_PlayerOptions[p] = PlayerOptions();
+	GAMESTATE->m_SongOptions = SongOptions();
 
 
 
@@ -309,7 +313,7 @@ void ScreenNameEntry::DrawPrimitives()
 		for( int i=0; i<NUM_CHARS_TO_DRAW_TOTAL; i++ )
 		{
 			char c = NAME_CHARS[iCharIndex];
-			for( int t=0; t<pStyleDef->m_iColsPerPlayer; t++ )
+			for( int t=0; t<pStyleDef->m_iColsPerPlayer && t<MAX_RANKING_NAME_LENGTH; t++ )
 			{
 				m_textScrollingChars[p][t].SetText( ssprintf("%c",c) );	// why doens't CStdStr have a contructor that takes a char?
 				m_textScrollingChars[p][t].SetY( fY );
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index c3b5c97a48..f1dc413843 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -60,7 +60,7 @@ IntDir=.\../Release6
 TargetDir=\stepmania\stepmania
 TargetName=StepMania
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                       	cl                                                        /Zl                                                        /nologo                                                        /c                                                        verstub.cpp                                                        /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                        	cl                                                         /Zl                                                         /nologo                                                         /c                                                         verstub.cpp                                                         /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -95,7 +95,7 @@ IntDir=.\../Debug6
 TargetDir=\stepmania\stepmania
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                                       	cl                                                        /Zl                                                        /nologo                                                        /c                                                        verstub.cpp                                                        /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                        	cl                                                         /Zl                                                         /nologo                                                         /c                                                         verstub.cpp                                                         /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -1846,6 +1846,10 @@ SOURCE=.\error2.bmp
 # End Source File
 # Begin Source File
 
+SOURCE=.\loading.bmp
+# End Source File
+# Begin Source File
+
 SOURCE=.\StepMania.xpm
 # End Source File
 # End Target