diff --git a/Makefile b/Makefile
index 99777c9..e228aef 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ mp_suggest_man.pdf: mp_suggest_man.tex
 	xelatex $<
 
 clean:
-	rm mp_suggest.man mp_suggest.1 mp_suggest_man.log mp_suggest_man.out mp_suggest_man.aux mp_suggest_man.pdf
+	rm -f mp_suggest.man mp_suggest.1 mp_suggest_man.log mp_suggest_man.out mp_suggest_man.aux mp_suggest_man.pdf
 
 all: ${TARFILES}
 
diff --git a/mp_suggest_man.tex b/mp_suggest_man.tex
index 7845f93..55efe5a 100644
--- a/mp_suggest_man.tex
+++ b/mp_suggest_man.tex
@@ -35,9 +35,9 @@
 \section{Synopsis}
 %%%%%%%%%%%%%%%%%%
 
-\Prog{mp\_suggest} \oOptArg{-g}{genre}
-                 \oOptArg{-r}{artist}
-                 \oOptArg{-a}{album}
+\Prog{mp\_suggest} \oOptArg{-g}{ genre}
+                 \oOptArg{-r}{ artist}
+                 \oOptArg{-a}{ album}
                  \oOpt{-d}
                  \oOpt{-n}
                  \oOpt{-h}
@@ -65,15 +65,15 @@ own music archive, but as an exercise in writing Hy, it was fun.
 \section{Options}
 %%%%%%%%%%%%%%%%%
 \begin{Description}
-\item[\OptArg{--genre}{genre}] Set the genre manually from the command
+\item[\OptArg{--genre}{ genre}] Set the genre manually from the command
   line.  This overrides any settings found in the ID3 tag.  A short form
   of this tag is ``-g''
 
-\item[\OptArg{--album}{album}] Set the album manually from the command
+\item[\OptArg{--album}{ album}] Set the album manually from the command
   line.  This overrides any settings found in the ID3 tag.  A short form
   of this tag is ``-a''
 
-\item[\OptArg{--artist}{artist}] Set the artist manually from the command
+\item[\OptArg{--artist}{ artist}] Set the artist manually from the command
   line.  This overrides any settings found in the ID3 tag.  A short form
   of this tag is ``-r''
 
@@ -90,6 +90,7 @@ own music archive, but as an exercise in writing Hy, it was fun.
 
 \item[\Opt{--version}] Print the version information.  A short form of this
   tag is ``-v''
+\end{Description}
 
 \section{Requirements}
 %%%%%%%%%%%%%%%%%%%%%%