diff --git a/stepmania/TODO.chris b/stepmania/TODO.chris
index d38acd072f..33c707522f 100644
--- a/stepmania/TODO.chris
+++ b/stepmania/TODO.chris
@@ -2,10 +2,20 @@
 Fix
 /////////////////////////
 
+> We also throw when we get a difficulty we don't know about.
+
+> LifeMeterBattery::Refresh wants "x", but the font being used..
+
+Like when playing MAX300, how the judgement "pulsing" goofs up?
+
+freezes are locked until NG
+
 the CDTitles DWI style arent being read anymore.
 
 faster IniFile (with std::map?)
 
+flag for use hold head
+
 fix movie texture crash
 
 The "groove bar" reports at the results screen is broken. 
@@ -40,8 +50,6 @@ slower eval bar tween
 
 add turns to editor
 
-sample pop
-
 fix screwed up scroll bar
 
 send disc to Penny Arcade
@@ -54,8 +62,6 @@ lyrics
 
 team seattle link
 
-flag for use hold head
-
 //////////////////////
 Animachanic suggestions:
 //////////////////////
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 68ff7bc617..10ca21f169 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -468,11 +468,13 @@ void Player::OnRowDestroyed( int col, int iIndexThatWasSteppedOn )
 	case TNS_GOOD:		fStartZoomX = g_fJudgeGoodZoomX;	fStartZoomY = g_fJudgeGoodZoomY;	break;
 	case TNS_BOO:		fStartZoomX = g_fJudgeBooZoomX;		fStartZoomY = g_fJudgeBooZoomY;		break;
 	}
+	m_frameJudgement.StopTweening();
 	m_frameJudgement.SetZoomX( fStartZoomX );
 	m_frameJudgement.SetZoomY( fStartZoomY );
 	m_frameJudgement.BeginTweening( g_fComboJudgeTweenSeconds );
 	m_frameJudgement.SetTweenZoom( 1 );
 
+	m_frameCombo.StopTweening();
 	m_frameCombo.SetZoomX( fStartZoomX );
 	m_frameCombo.SetZoomY( fStartZoomY );
 	m_frameCombo.BeginTweening( g_fComboJudgeTweenSeconds );