diff --git a/aegisub/src/audio_player_portaudio.cpp b/aegisub/src/audio_player_portaudio.cpp
index b184a763a..7963d69f8 100644
--- a/aegisub/src/audio_player_portaudio.cpp
+++ b/aegisub/src/audio_player_portaudio.cpp
@@ -48,7 +48,6 @@
 #include "utils.h"
 #include "charset_conv.h"
 
-/// @define PORTAUDIO_DEBUG Enable debugging?
 //#define PORTAUDIO_DEBUG
 
 
@@ -277,9 +276,9 @@ int64_t PortAudioPlayer::GetCurrentPosition()
 
 
 
-/// @brief @param Setting from config file.
+/// @brief Get list of available output devices
 /// @param favorite Favorite output device
-/// @return List of available output devices.
+/// @return List of available output devices with the 'favorite' being first in the list.
 wxArrayString PortAudioPlayer::GetOutputDevices(wxString favorite) {
 	wxArrayString list;
 	int devices = Pa_GetDeviceCount();
diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp
index 90f2ea807..d860c5519 100644
--- a/aegisub/src/ffmpegsource_common.cpp
+++ b/aegisub/src/ffmpegsource_common.cpp
@@ -143,9 +143,8 @@ std::map<int,wxString> FFmpegSourceProvider::GetTracksOfType(FFIndexer *Indexer,
 
 
 /// @brief Ask user for which track he wants to load 
-/// @param std::map<int 
-/// @param TrackList    
-/// @param Type         
+/// @param TrackList 
+/// @param Type      
 /// @return 
 ///
 int FFmpegSourceProvider::AskForTrackSelection(const std::map<int,wxString> &TrackList, FFMS_TrackType Type) {
diff --git a/aegisub/src/subtitles_provider_csri.h b/aegisub/src/subtitles_provider_csri.h
index 674cefed4..320c4c6f7 100644
--- a/aegisub/src/subtitles_provider_csri.h
+++ b/aegisub/src/subtitles_provider_csri.h
@@ -88,7 +88,7 @@ class CSRISubtitlesProviderFactory : public SubtitlesProviderFactory {
 public:
 
 	/// @brief DOCME
-	/// @param subType=_T(Ó) 
+	/// @param subType
 	///
 	SubtitlesProvider *CreateProvider(wxString subType=_T("")) { return new CSRISubtitlesProvider(subType); }
 	wxArrayString GetSubTypes();
diff --git a/aegisub/src/subtitles_provider_libass.h b/aegisub/src/subtitles_provider_libass.h
index fa278cad8..81c341133 100644
--- a/aegisub/src/subtitles_provider_libass.h
+++ b/aegisub/src/subtitles_provider_libass.h
@@ -85,7 +85,7 @@ class LibassSubtitlesProviderFactory : public SubtitlesProviderFactory {
 public:
 
 	/// @brief DOCME
-	/// @param subType=_T(Ó) 
+	/// @param subType
 	///
 	SubtitlesProvider *CreateProvider(wxString subType=_T("")) { return new LibassSubtitlesProvider(); }
 };