diff --git a/include/OggFLAC/stream_decoder.h b/include/OggFLAC/stream_decoder.h
index b855febd..1768077a 100644
--- a/include/OggFLAC/stream_decoder.h
+++ b/include/OggFLAC/stream_decoder.h
@@ -144,7 +144,7 @@ struct OggFLAC__StreamDecoderPrivate;
  *  for a detailed description.
  */
 typedef struct {
-	FLAC__StreamDecoder super_; /* parentclass@@@@@@ */
+	FLAC__StreamDecoder super_;
 	struct OggFLAC__StreamDecoderProtected *protected_; /* avoid the C++ keyword 'protected' */
 	struct OggFLAC__StreamDecoderPrivate *private_; /* avoid the C++ keyword 'private' */
 } OggFLAC__StreamDecoder;
diff --git a/include/OggFLAC/stream_encoder.h b/include/OggFLAC/stream_encoder.h
index 2774d61a..db6bf8a7 100644
--- a/include/OggFLAC/stream_encoder.h
+++ b/include/OggFLAC/stream_encoder.h
@@ -164,7 +164,7 @@ struct OggFLAC__StreamEncoderPrivate;
  *  for a detailed description.
  */
 typedef struct {
-	FLAC__StreamEncoder super_; /* parentclass@@@@@@ */
+	FLAC__StreamEncoder super_;
 	struct OggFLAC__StreamEncoderProtected *protected_; /* avoid the C++ keyword 'protected' */
 	struct OggFLAC__StreamEncoderPrivate *private_; /* avoid the C++ keyword 'private' */
 } OggFLAC__StreamEncoder;
diff --git a/src/libFLAC/include/private/lpc.h b/src/libFLAC/include/private/lpc.h
index 970db8a8..b99da8ee 100644
--- a/src/libFLAC/include/private/lpc.h
+++ b/src/libFLAC/include/private/lpc.h
@@ -45,7 +45,7 @@
  *	FLAC__lpc_window_data()
  *	--------------------------------------------------------------------
  *	Applies the given window to the data.
- *  @@@@@@ asm optimize
+ *  @@@ asm optimize
  *
  *	IN in[0,data_len-1]
  *	IN window[0,data_len-1]
diff --git a/src/libFLAC/metadata_iterators.c b/src/libFLAC/metadata_iterators.c
index b023c74b..2ecb8b1e 100644
--- a/src/libFLAC/metadata_iterators.c
+++ b/src/libFLAC/metadata_iterators.c
@@ -2835,6 +2835,7 @@ FLAC__bool transport_tempfile_(const char *filename, FILE **tempfile, char **tem
 	*tempfile = 0;
 
 #if defined _MSC_VER || defined __MINGW32__ || defined __EMX__
+	/* on some flavors of windows, rename() will fail if the destination already exists */
 	if(unlink(filename) < 0) {
 		cleanup_tempfile_(tempfile, tempfilename);
 		*status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_UNLINK_ERROR;
diff --git a/src/test_libFLAC++/metadata_manip.cpp b/src/test_libFLAC++/metadata_manip.cpp
index f1c34aba..a8138130 100644
--- a/src/test_libFLAC++/metadata_manip.cpp
+++ b/src/test_libFLAC++/metadata_manip.cpp
@@ -224,6 +224,7 @@ bool transport_tempfile_(const char *filename, FILE **tempfile, char **tempfilen
 	}
 
 #if defined _MSC_VER || defined __MINGW32__ || defined __EMX__
+	/* on some flavors of windows, rename() will fail if the destination already exists */
 	if(unlink(filename) < 0) {
 		cleanup_tempfile_(tempfile, tempfilename);
 		return false;
diff --git a/src/test_libFLAC/metadata_manip.c b/src/test_libFLAC/metadata_manip.c
index 85d8eb2c..21a8fa42 100644
--- a/src/test_libFLAC/metadata_manip.c
+++ b/src/test_libFLAC/metadata_manip.c
@@ -211,6 +211,7 @@ FLAC__bool transport_tempfile_(const char *filename, FILE **tempfile, char **tem
 	}
 
 #if defined _MSC_VER || defined __MINGW32__ || defined __EMX__
+	/* on some flavors of windows, rename() will fail if the destination already exists */
 	if(unlink(filename) < 0) {
 		cleanup_tempfile_(tempfile, tempfilename);
 		return false;
diff --git a/test/test_flac.sh b/test/test_flac.sh
index 7dfc134c..6bf71b9e 100755
--- a/test/test_flac.sh
+++ b/test/test_flac.sh
@@ -617,7 +617,7 @@ rm noise.flac z.wav
 # test --input-size
 ############################################################################
 
-#@@@@@@ cat will not work on old cygwin, need to fix
+#@@@ cat will not work on old cygwin, need to fix
 if [ $is_win = no ] ; then
 	echo -n "testing --input-size=50 --skip=10... "
 	cat 50c.raw | run_flac $raw_eopt --input-size=50 --skip=10 -o z50c.skip10.flac - || die "ERROR generating FLAC file"