diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index e062167212..f4bfa4d7df 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -21,7 +21,7 @@ DefaultScrollDirection=0
 [ScreenTitleMenu]
 ChoicesX=320
 ChoicesStartY=92
-ChoicesSpacingY=48
+ChoicesSpacingY=52
 ChoicesShadowLength=5
 HelpX=320
 HelpY=440
diff --git a/stepmania/src/MenuElements.cpp b/stepmania/src/MenuElements.cpp
index a3424866e4..99bc262504 100644
--- a/stepmania/src/MenuElements.cpp
+++ b/stepmania/src/MenuElements.cpp
@@ -96,7 +96,7 @@ void MenuElements::Load( CString sBackgroundPath, CString sTopEdgePath, CString
 	}
 
 	m_MenuTimer.SetXY( TIMER_X, TIMER_Y );
-	if( !bTimerEnabled  ||  !PREFSMAN->m_bMenuTimer )
+	if( !bTimerEnabled  ||  !PREFSMAN->m_bMenuTimer  ||  GAMESTATE->m_bEditing )
 	{
 		m_MenuTimer.SetTimer( 99 );
 		m_MenuTimer.Update( 0 );
diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 6e7135d343..11ae14d752 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -1075,7 +1075,7 @@ void NoteDataUtil::InsertIntelligentTaps( NoteData &in, float fBeatInterval )
 		// don't insert a new note if there's already one within this interval
 		bool bNoteInMiddle = false;
 		for( int j=iRowEarlier+1; j<=iRowLater-1; j++ )
-			if( !in.IsRowEmpty(iRowMiddle) )
+			if( !in.IsRowEmpty(j) )
 			{
 				bNoteInMiddle = true;
 				break;
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 8e8201ae2f..81c9eb28d6 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -624,7 +624,7 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
 						m_fDestinationScrollSpeed = 2;
 						m_soundMarker.Play();
 					}
-					else if( m_fDestinationScrollSpeed == 2 )
+					else // if( m_fDestinationScrollSpeed == 2 )
 					{
 						m_fDestinationScrollSpeed = 1;
 						m_soundMarker.Play();
@@ -633,16 +633,16 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
 				}
 				else if( DeviceI.button == SDLK_DOWN )
 				{
-					if( m_fDestinationScrollSpeed == 1 )
-					{
-						m_fDestinationScrollSpeed = 2;
-						m_soundMarker.Play();
-					}
-					else if( m_fDestinationScrollSpeed == 2 )
+					if( m_fDestinationScrollSpeed == 2 )
 					{
 						m_fDestinationScrollSpeed = 4;
 						m_soundMarker.Play();
 					}
+					else //if( m_fDestinationScrollSpeed == 1 )
+					{
+						m_fDestinationScrollSpeed = 2;
+						m_soundMarker.Play();
+					}
 					break;
 				}
 			}