diff --git a/stepmania/src/AnnouncerManager.cpp b/stepmania/src/AnnouncerManager.cpp
index 2e8eb74cf0..e3e871a287 100644
--- a/stepmania/src/AnnouncerManager.cpp
+++ b/stepmania/src/AnnouncerManager.cpp
@@ -30,12 +30,13 @@ AnnouncerManager::AnnouncerManager()
 	for( int i=0; i<arrayAnnouncerNames.GetSize(); i++ )
 		AssertAnnouncerIsComplete( arrayAnnouncerNames[i] );
 
-	SwitchAnnouncer( DEFAULT_ANNOUNCER_NAME );
+	//SwitchAnnouncer( DEFAULT_ANNOUNCER_NAME );
+	SwitchAnnouncer( arrayAnnouncerNames[0] );
 }
 
 void AnnouncerManager::GetAnnouncerNames( CStringArray& AddTo )
 {
-	GetDirListing( DEFAULT_ANNOUNCER_NAME+"\\*", AddTo, true );
+	GetDirListing( ANNOUNER_BASE_DIR+"*", AddTo, true );
 	
 	// strip out the folder called "CVS"
 	for( int i=AddTo.GetSize()-1; i>=0; i-- )
diff --git a/stepmania/src/AnnouncerManager.h b/stepmania/src/AnnouncerManager.h
index a29b478dfe..6570e51472 100644
--- a/stepmania/src/AnnouncerManager.h
+++ b/stepmania/src/AnnouncerManager.h
@@ -42,7 +42,6 @@ enum AnnouncerElement {
 	ANNOUNCER_EVALUATION_FINAL_B,
 	ANNOUNCER_EVALUATION_FINAL_C,
 	ANNOUNCER_EVALUATION_FINAL_D,
-	ANNOUNCER_EVALUATION_FINAL_E,
 	ANNOUNCER_GAME_OVER,
 	ANNOUNCER_MUSIC_SCROLL,
 	ANNOUNCER_EVALUATION_A,
@@ -51,7 +50,6 @@ enum AnnouncerElement {
 	ANNOUNCER_EVALUATION_B,
 	ANNOUNCER_EVALUATION_C,
 	ANNOUNCER_EVALUATION_D,
-	ANNOUNCER_EVALUATION_E,
 	ANNOUNCER_SELECT_COURSE_INTRO,
 	ANNOUNCER_SELECT_DIFFICULTY_COMMENT_EASY,
 	ANNOUNCER_SELECT_DIFFICULTY_COMMENT_HARD,
diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp
index 8b3b97cfea..4ef631681c 100644
--- a/stepmania/src/Background.cpp
+++ b/stepmania/src/Background.cpp
@@ -35,10 +35,7 @@ Background::Background()
 	m_sprDangerBackground.StretchTo( CRect((int)SCREEN_LEFT, (int)SCREEN_TOP, (int)SCREEN_RIGHT, (int)SCREEN_BOTTOM) );
 
 	// Load background animations
-	for( int i=0; i<NUM_BACKGROUND_ANIMATION_TYPES; i++ )
-	{
-		m_BackgroundAnimations.Add( new BackgroundAnimation( (BackgroundAnimationType)i ) );
-	}
+	m_BackgroundAnimations.Add( new BackgroundAnimation(NULL) );
 
 	m_pCurBackgroundAnimation = NULL;
 }
diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 302a5bef43..1e36d36965 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -710,10 +710,7 @@ void NoteData::SetFromMeasureStrings( CStringArray &arrayMeasureStrings )
 			CString sNoteLine = arrayNoteLines[l];
 			sNoteLine.TrimRight();
 
-			if( m_iNumTracks == 0 )
-				m_iNumTracks = sNoteLine.GetLength();
-			if( m_iNumTracks != sNoteLine.GetLength() )
-				throw RageException( "Line doesn't have right number of notes." );
+			m_iNumTracks = max( m_iNumTracks, sNoteLine.GetLength() );
 
 			for( int c=0; c<sNoteLine.GetLength(); c++ )
 			{
diff --git a/stepmania/src/ScreenCaution.cpp b/stepmania/src/ScreenCaution.cpp
index 8aae7f4c9a..7cdefd966f 100644
--- a/stepmania/src/ScreenCaution.cpp
+++ b/stepmania/src/ScreenCaution.cpp
@@ -50,7 +50,8 @@ void ScreenCaution::HandleScreenMessage( const ScreenMessage SM )
 	switch( SM )
 	{
 	case SM_StartClosing:
-		m_Wipe.CloseWipingRight( SM_GoToSelectMusic );
+		if( !m_Wipe.IsClosing() )
+			m_Wipe.CloseWipingRight( SM_GoToSelectMusic );
 		break;
 	case SM_DoneOpening:
 		if( PREFSMAN->m_bAnnouncer )
@@ -64,5 +65,6 @@ void ScreenCaution::HandleScreenMessage( const ScreenMessage SM )
 
 void ScreenCaution::MenuStart( const PlayerNumber p )
 {
-	m_Wipe.CloseWipingRight( SM_GoToSelectMusic );
+	if( !m_Wipe.IsClosing() )
+		m_Wipe.CloseWipingRight( SM_GoToSelectMusic );
 }
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index 388ef66109..92f0dafd94 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -463,7 +463,6 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
 		
 		switch( max_grade )
 		{
-		case GRADE_E:	SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo(ANNOUNCER_EVALUATION_E) );		break;
 		case GRADE_D:	SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo(ANNOUNCER_EVALUATION_D) );		break;
 		case GRADE_C:	SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo(ANNOUNCER_EVALUATION_C) );		break;
 		case GRADE_B:	SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo(ANNOUNCER_EVALUATION_B) );		break;