diff --git a/src/GameState.cpp b/src/GameState.cpp
index 352a252c41..7e89e385f3 100644
--- a/src/GameState.cpp
+++ b/src/GameState.cpp
@@ -761,6 +761,7 @@ void GameState::FinishStage()
 		LOG->Trace( "awarded extra stage" );
 		FOREACH_HumanPlayer( p )
 		{
+			// todo: unhardcode the extra stage limit? -aj
 			if( m_iAwardedExtraStages[p] < 2 )
 			{
 				++m_iAwardedExtraStages[p];
diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp
index 04e42f58db..ecede280c6 100644
--- a/src/ScreenEdit.cpp
+++ b/src/ScreenEdit.cpp
@@ -657,9 +657,8 @@ static MenuDef g_CourseMode(
 	MenuRowDef( -1, "Play mods from course",	true, EditMode_Practice, true, false, 0, NULL )
 );
 
-// HACK: need to remember the track we're inserting on so
-// that we can lay the attack note after coming back from
-// menus.
+// HACK: need to remember the track we're inserting on so that we can lay the
+// attack note after coming back from menus.
 static int g_iLastInsertTapAttackTrack = -1;
 static float g_fLastInsertAttackDurationSeconds = -1;
 static float g_fLastInsertAttackPositionSeconds = -1;
@@ -669,7 +668,7 @@ static void SetDefaultEditorNoteSkin( size_t num, RString &sNameOut, RString &de
 {
 	sNameOut = ssprintf( "EditorNoteSkinP%d", int(num + 1) );
 
-	// XXX: We need more supported note skins.
+	// XXX: We need more supported noteskins.
 	switch( num )
 	{
 	case 0: defaultValueOut = "default"; return;