diff --git a/stepmania/src/ScreenDemonstration.cpp b/stepmania/src/ScreenDemonstration.cpp
index 098e3f918c..736006c341 100644
--- a/stepmania/src/ScreenDemonstration.cpp
+++ b/stepmania/src/ScreenDemonstration.cpp
@@ -68,7 +68,7 @@ void ScreenDemonstration::Init()
 	GAMESTATE->m_bGameplayLeadIn.Set( false );
 
 	m_DancingState = STATE_DANCING;
-	this->PostScreenMessage( SM_BeginFadingOut, SECONDS_TO_SHOW );	
+	this->PostScreenMessage( SM_BeginFadingOut, SECONDS_TO_SHOW );		// TODO: Use MenuTimer instead?
 }
 
 void ScreenDemonstration::HandleScreenMessage( const ScreenMessage SM )
diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp
index af582bbe78..3137987e4f 100644
--- a/stepmania/src/ScreenWithMenuElements.cpp
+++ b/stepmania/src/ScreenWithMenuElements.cpp
@@ -63,6 +63,7 @@ void ScreenWithMenuElements::Init()
 		this->AddChild( m_MenuTimer );
 	}
 
+	/* TODO: Remove overlay and underlay in favor of more flexible decorations */
 	m_sprUnderlay.Load( THEME->GetPathB(m_sName,"underlay") );
 	m_sprUnderlay->SetName("Underlay");
 	m_sprUnderlay->SetDrawOrder( DRAW_ORDER_UNDERLAY );