diff --git a/src/FontCharAliases.cpp b/src/FontCharAliases.cpp
index d68bdead09..8097f8e3c2 100644
--- a/src/FontCharAliases.cpp
+++ b/src/FontCharAliases.cpp
@@ -35,7 +35,7 @@ static map<RString,RString> CharAliasRepl;
 // old SPiGuMuS kanji font hack.
 // a more modern implementation would likely involve a Lua file in Data for the
 // base character aliases, and any alias not encountered in the list would be
-// added at the next possible code point. -aj
+// added at the next possible internal code point. -aj
 
 /* Here's a copy-and-paste for a basic Japanese font page:
 
@@ -345,6 +345,7 @@ static void InitCharAliases()
 		{ "auxrb",	INTERNAL },
 		{ "auxlt",	INTERNAL },
 		{ "auxrt",	INTERNAL },
+		{ "auxback",	INTERNAL },
 
 		{ NULL, 	0 }
 	};
diff --git a/src/Song.cpp b/src/Song.cpp
index 1499880dab..f664e905e5 100644
--- a/src/Song.cpp
+++ b/src/Song.cpp
@@ -745,11 +745,9 @@ void Song::ReCalculateRadarValuesAndLastBeat()
 
 		pSteps->CalculateRadarValues( m_fMusicLengthSeconds );
 
-		//
 		// calculate lastBeat
-		//
 
-		/* If it's autogen, then first/last beat will come from the parent. */
+		// If it's autogen, then first/last beat will come from the parent.
 		if( pSteps->IsAutogen() )
 			continue;
 
@@ -845,9 +843,9 @@ bool Song::SaveToSMFile( RString sPath, bool bSavingCache )
 	{
 		Steps *pSteps = *s;
 		if( pSteps->IsAutogen() )
-			continue; /* don't write autogen notes */
+			continue; // don't write autogen notes
 
-		/* Only save steps that weren't loaded from a profile. */
+		// Only save steps that weren't loaded from a profile.
 		if( pSteps->WasLoadedFromProfile() )
 			continue;
 
@@ -932,7 +930,7 @@ void Song::AddAutoGenNotes()
 		if( HasNotes[stMissing] )
 			continue;
 
-		/* If m_bAutogenSteps is disabled, only autogen lights. */
+		// If m_bAutogenSteps is disabled, only autogen lights.
 		if( !PREFSMAN->m_bAutogenSteps && stMissing != StepsType_lights_cabinet )
 			continue;
 		if( !GAMEMAN->GetStepsTypeInfo(stMissing).bAllowAutogen )
@@ -950,7 +948,7 @@ void Song::AddAutoGenNotes()
 			if( !HasNotes[st] )
 				continue;
 
-			/* has (non-autogen) Steps of this type */
+			// has (non-autogen) Steps of this type
 			const int iNumTracks = GAMEMAN->GetStepsTypeInfo(st).iNumTracks;
 			const int iTrackDifference = abs(iNumTracks-iNumTracksOfMissing);
 			if( iTrackDifference < iBestTrackDifference )
@@ -996,7 +994,7 @@ void Song::RemoveAutoGenNotes()
 		{
 			if( m_vpStepsByType[st][j]->IsAutogen() )
 			{
-//				delete m_vpSteps[j]; // delete below
+				// delete m_vpSteps[j]; // delete below
 				m_vpStepsByType[st].erase( m_vpStepsByType[st].begin()+j );
 			}
 		}
@@ -1236,7 +1234,6 @@ void Song::DeleteSteps( const Steps* pSteps, bool bReAutoGen )
 	if( bReAutoGen )
 		RemoveAutoGenNotes();
 
-
 	vector<Steps*> &vpSteps = m_vpStepsByType[pSteps->m_StepsType];
 	for( int j=vpSteps.size()-1; j>=0; j-- )
 	{
diff --git a/src/StepsUtil.cpp b/src/StepsUtil.cpp
index d63add034d..d1c88b0db6 100644
--- a/src/StepsUtil.cpp
+++ b/src/StepsUtil.cpp
@@ -87,9 +87,7 @@ bool StepsUtil::HasMatching( const Song *pSong, const StepsCriteria &stc )
 	return false;
 }
 
-//
 // Sorting stuff
-//
 map<const Steps*, RString> steps_sort_val;
 
 static bool CompareStepsPointersBySortValueAscending(const Steps *pSteps1, const Steps *pSteps2)