diff --git a/src/GameplayAssist.h b/src/GameplayAssist.h
index f63417b092..2bfe60c27f 100644
--- a/src/GameplayAssist.h
+++ b/src/GameplayAssist.h
@@ -13,7 +13,8 @@ public:
 	void Init();
 	/**
 	 * @brief Play the sounds in question for the particular chart.
-	 * @param nd the note data used for playing the ticks. */
+	 * @param nd the note data used for playing the ticks.
+	 * @param ps the player's state (and number) for Split Timing. */
 	void PlayTicks( const NoteData &nd, const PlayerState *ps );
 	/** @brief Stop playing the sounds. */
 	void StopPlaying();
diff --git a/src/Song.h b/src/Song.h
index 70b4c20cb5..825e7e2dc4 100644
--- a/src/Song.h
+++ b/src/Song.h
@@ -341,10 +341,6 @@ public:
 	Steps *CreateSteps();
 	void InitSteps(Steps *pSteps);
 
-	/**
-	 * @brief Retrieve the beat based on the specified time.
-	 * @param fElapsedTime the amount of time since the Song started.
-	 * @return the appropriate beat. */
 	/* [splittiming]
 	float SongGetBeatFromElapsedTime( float fElapsedTime ) const 
 	{
diff --git a/src/TimingData.h b/src/TimingData.h
index 9b8889b207..048b5d885c 100644
--- a/src/TimingData.h
+++ b/src/TimingData.h
@@ -1350,13 +1350,13 @@ public:
 	/**
 	 * @brief Set the row to have the new Combo.
 	 * @param iNoteRow the row to have the new Combo.
-	 * @param iTicks the Combo.
+	 * @param iCombo the Combo.
 	 */
 	void SetComboAtRow( int iNoteRow, int iCombo );
 	/**
 	 * @brief Set the beat to have the new Combo.
 	 * @param fBeat the beat to have the new Combo.
-	 * @param iTicks the Combo.
+	 * @param iCombo the Combo.
 	 */
 	void SetComboAtBeat( float fBeat, int iCombo ) { SetComboAtRow( BeatToNoteRow( fBeat ), iCombo ); }
 	/**