diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 065f3d7728..b01770ea10 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -112,8 +112,7 @@ ExplanationPage1Y=70
 ExplanationPage2X=1100
 ExplanationPage2Y=70
 ChoicesOnPage1=Beginner,Easy,Medium,Hard
-ChoicesOnPage2=Nonstop,Oni,Endless,Battle
-
+ChoicesOnPage2=Nonstop,Oni,Endless
 Page1Choice1X=98
 Page1Choice1Y=180
 Page1Choice2X=246
@@ -124,14 +123,12 @@ Page1Choice4X=542
 Page1Choice4Y=220
 Page1Choice5X=542
 Page1Choice5Y=220
-Page2Choice1X=738
-Page2Choice1Y=180
-Page2Choice2X=886
-Page2Choice2Y=220
-Page2Choice3X=1034
-Page2Choice3Y=180
-Page2Choice4X=1182
-Page2Choice4Y=220
+Page2Choice1X=760
+Page2Choice1Y=200
+Page2Choice2X=960
+Page2Choice2Y=200
+Page2Choice3X=1160
+Page2Choice3Y=200
 CursorOffsetP1X=-40
 CursorOffsetP1Y=200
 CursorOffsetP2X=+40
@@ -377,16 +374,16 @@ DifficultyP2Y=410
 DifficultyP2ReverseY=58
 DifficultyP2ExtraY=420
 DifficultyP2ExtraReverseY=70
-ActiveItemsP1X=280
-ActiveItemsP1Y=370
-ActiveItemsP1ReverseY=98
-ActiveItemsP1ExtraY=380
-ActiveItemsP1ExtraReverseY=110
-ActiveItemsP2X=340
-ActiveItemsP2Y=370
-ActiveItemsP2ReverseY=98
-ActiveItemsP2ExtraY=380
-ActiveItemsP2ExtraReverseY=110
+ActiveItemsP1X=0
+ActiveItemsP1Y=0
+ActiveItemsP1ReverseY=0
+ActiveItemsP1ExtraY=0
+ActiveItemsP1ExtraReverseY=0
+ActiveItemsP2X=0
+ActiveItemsP2Y=0
+ActiveItemsP2ReverseY=0
+ActiveItemsP2ExtraY=0
+ActiveItemsP2ExtraReverseY=0
 SurviveTimeX=320
 SurviveTimeY=340
 DebugX=320
@@ -1015,17 +1012,11 @@ ModifiersZoom=0.5
 ModifiersHorizAlign=2
 
 [Inventory]
-NumItemTypes=3
-ItemDurationSeconds=10
-Item1Combo=25
-Item1Effect=dizzy
-Item2Combo=50
-Item2Effect=sudden
-Item3Combo=75
-Item3Effect=expand
+NumItemTypes=0
+ItemDurationSeconds=0
 
 [ActiveItemList]
-TextHorizAlignP1=2
+TextHorizAlignP1=0
 TextHorizAlignP2=0
-TextZoom=0.8
-SpacingY=24
+TextZoom=0
+SpacingY=0
diff --git a/stepmania/src/ScoreKeeper.h b/stepmania/src/ScoreKeeper.h
index 9ea3aeecf3..eefd1ff3f9 100644
--- a/stepmania/src/ScoreKeeper.h
+++ b/stepmania/src/ScoreKeeper.h
@@ -37,8 +37,8 @@ public:
 	ScoreKeeper(PlayerNumber pn) { m_PlayerNumber=pn; }
 	virtual void DrawPrimitives() { }
 
-	virtual void HandleTapScore( TapNoteScore score, int iNumTapsInRow ) { }
-	virtual void HandleHoldScore( HoldNoteScore score, TapNoteScore TapNoteScore ) { }
+	virtual void HandleTapScore( TapNoteScore score, int iNumTapsInRow ) = 0;
+	virtual void HandleHoldScore( HoldNoteScore score, TapNoteScore TapNoteScore ) = 0;
 };
 
 #endif
diff --git a/stepmania/src/ScoreKeeperMAX2.cpp b/stepmania/src/ScoreKeeperMAX2.cpp
index 8ab80bad0b..179809f4d4 100644
--- a/stepmania/src/ScoreKeeperMAX2.cpp
+++ b/stepmania/src/ScoreKeeperMAX2.cpp
@@ -46,10 +46,8 @@ void ScoreKeeperMAX2::AddScore( TapNoteScore score )
 	GAMESTATE->m_CurStageStats.fScore[m_PlayerNumber] = m_lScore * m_fScoreMultiplier;
 }
 
-void ScoreKeeperMAX2::HandleNoteScore( TapNoteScore score, int iNumTapsInRow )
+void ScoreKeeperMAX2::HandleTapScore( TapNoteScore score, int iNumTapsInRow )
 {
-	ScoreKeeper::HandleTapScore(score, iNumTapsInRow);
-
 	ASSERT( iNumTapsInRow >= 1 );
 
 	// update dance points for Oni lifemeter
@@ -98,7 +96,7 @@ void ScoreKeeperMAX2::HandleNoteScore( TapNoteScore score, int iNumTapsInRow )
 }
 
 
-void ScoreKeeperMAX2::HandleHoldNoteScore( HoldNoteScore score, TapNoteScore TapNoteScore )
+void ScoreKeeperMAX2::HandleHoldScore( HoldNoteScore score, TapNoteScore TapNoteScore )
 {
 	// update dance points totals
 	GAMESTATE->m_CurStageStats.iHoldNoteScores[m_PlayerNumber][score] ++;
diff --git a/stepmania/src/ScoreKeeperMAX2.h b/stepmania/src/ScoreKeeperMAX2.h
index 217b267a2e..41427724bd 100644
--- a/stepmania/src/ScoreKeeperMAX2.h
+++ b/stepmania/src/ScoreKeeperMAX2.h
@@ -27,8 +27,8 @@ class ScoreKeeperMAX2: public ScoreKeeper
 public:
 	ScoreKeeperMAX2(Notes *notes, NoteDataWithScoring &data, PlayerNumber pn);
 
-	void HandleNoteScore( TapNoteScore score, int iNumTapsInRow );
-	void HandleHoldNoteScore( HoldNoteScore score, TapNoteScore TapNoteScore );
+	void HandleTapScore( TapNoteScore score, int iNumTapsInRow );
+	void HandleHoldScore( HoldNoteScore score, TapNoteScore TapNoteScore );
 };
 
 #endif