diff --git a/include/FLAC/stream_encoder.h b/include/FLAC/stream_encoder.h
index 7cddc067..7255c8a7 100644
--- a/include/FLAC/stream_encoder.h
+++ b/include/FLAC/stream_encoder.h
@@ -1292,9 +1292,9 @@ FLAC_API FLAC__uint64 FLAC__stream_encoder_get_total_samples_estimate(const FLAC
  *  or FLAC__stream_encoder_process_interleaved().
  *  initialization succeeded.
  *
- *  The call to FLAC__stream_encoder_init_stream() currently will also immediately
- *  call the write callback several times, once with the \c fLaC signature,
- *  and once for each encoded metadata block.
+ *  The call to FLAC__stream_encoder_init_stream() currently will also
+ *  immediately call the write callback several times, once with the \c fLaC
+ *  signature, and once for each encoded metadata block.
  *
  * \param  encoder            An uninitialized encoder instance.
  * \param  write_callback     See FLAC__StreamEncoderWriteCallback.  This
@@ -1355,9 +1355,9 @@ FLAC_API FLAC__StreamEncoderInitStatus FLAC__stream_encoder_init_stream(FLAC__St
  *  or FLAC__stream_encoder_process_interleaved().
  *  initialization succeeded.
  *
- *  The call to FLAC__stream_encoder_init_ogg_stream() currently will
- *  also immediately call the write callback several times, once with
- *  the \c fLaC signature, and once for each encoded metadata block.@@@@@@
+ *  The call to FLAC__stream_encoder_init_ogg_stream() currently will also
+ *  immediately call the write callback several times to write the metadata
+ *  packets.
  *
  * \param  encoder            An uninitialized encoder instance.
  * \param  read_callback      See FLAC__StreamEncoderReadCallback.  This
diff --git a/src/flac/main.c b/src/flac/main.c
index 426fe277..83aa1a77 100644
--- a/src/flac/main.c
+++ b/src/flac/main.c
@@ -1780,7 +1780,7 @@ int encode_file(const char *infilename, FLAC__bool is_first_file, FLAC__bool is_
 	/* if infilename and outfilename point to the same file, we need to write to a temporary file */
 	if(encode_infile != stdin && grabbag__file_are_same(infilename, outfilename)) {
 		static const char *tmp_suffix = ".tmp,fl-ac+en'c";
-		/*@@@ still a remote possibility that a file with this filename exists */
+		/*@@@@ still a remote possibility that a file with this filename exists */
 		if(0 == (internal_outfilename = malloc(strlen(outfilename)+strlen(tmp_suffix)+1))) {
 			flac__utils_printf(stderr, 1, "ERROR allocating memory for tempfile name\n");
 			return 1;