diff --git a/stepmania/src/MusicBannerWheel.cpp b/stepmania/src/MusicBannerWheel.cpp
index 2ff1e68cc8..2634b8ddef 100644
--- a/stepmania/src/MusicBannerWheel.cpp
+++ b/stepmania/src/MusicBannerWheel.cpp
@@ -10,6 +10,15 @@
 -----------------------------------------------------------------------------
 */
 
+/*
+TODO:
+1. FIX TIMER
+2. MAKE 2PLAYER SUPPORT WORK CORRECTLY
+3. FIX THE MODE SWITCHER FOR EXTRAMIX FOR 2 PLAYER
+3a. MAKE IT METRICABLE
+*/
+
+
 #include "MusicBannerWheel.h"
 #include "RageUtil.h"
 #include "GameState.h"
diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp
index e27e32fec4..86ab905cdf 100644
--- a/stepmania/src/ScreenEz2SelectMusic.cpp
+++ b/stepmania/src/ScreenEz2SelectMusic.cpp
@@ -93,11 +93,6 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic")
 	m_ChoiceListFrame.SetXY( SCROLLING_LIST_X, SCROLLING_LIST_Y);
 	this->AddChild( &m_ChoiceListFrame );
 
-	m_Guide.Load( THEME->GetPathToG("ScreenEz2SelectMusic guide"));
-	m_Guide.SetXY( GUIDE_X, GUIDE_Y );
-	this->AddChild( &m_Guide );
-
-
 	m_MusicBannerWheel.SetX(SCROLLING_LIST_X);
 	m_MusicBannerWheel.SetY(SCROLLING_LIST_Y);
 
@@ -152,6 +147,10 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic")
 			m_iSelection[p] = 0;
 		}
 
+		m_Guide.Load( THEME->GetPathToG("ScreenEz2SelectMusic guide"));
+		m_Guide.SetXY( GUIDE_X, GUIDE_Y );
+		this->AddChild( &m_Guide );
+
 		m_InfoFrame.Load( THEME->GetPathToG("ScreenEz2SelectMusic infoframe") );
 		m_InfoFrame.SetXY( INFOFRAME_X, INFOFRAME_Y );
 		this->AddChild( &m_InfoFrame );
diff --git a/stepmania/src/ScreenSelect.h b/stepmania/src/ScreenSelect.h
index 8bbbb62107..9435e978be 100644
--- a/stepmania/src/ScreenSelect.h
+++ b/stepmania/src/ScreenSelect.h
@@ -43,7 +43,6 @@ protected:
 
 	MenuElements m_Menu;
 	BGAnimation m_BGAnimations[MAX_CHOICES];
-
 	vector<ModeChoice>	m_aModeChoices;		// derived classes should look here for what choices are available
 };