diff --git a/mdoc.cabal b/mdoc.cabal
--- a/mdoc.cabal
+++ b/mdoc.cabal
@@ -1,6 +1,6 @@
 cabal-version:      1.18
 name:               mdoc
-version:            0.4.1.2
+version:            0.4.1.3
 license:            AGPL-3
 license-file:       COPYING
 maintainer:         Pat Brisbin
diff --git a/src/Mdoc/Data/Argument.hs b/src/Mdoc/Data/Argument.hs
--- a/src/Mdoc/Data/Argument.hs
+++ b/src/Mdoc/Data/Argument.hs
@@ -40,6 +40,7 @@
     Required -> "Ar" <+> pretty (esc $ pack schema)
     _ -> "Op Ar" <+> pretty (esc $ pack schema)
 
+-- | Renders like @-C num@, or @-C[num]@ if the argument is optional
 data ShortArg = ShortArg
   { name :: Char
   , argument :: Argument
@@ -56,6 +57,8 @@
       Required -> id
       _ -> (<+> "Op")
 
+-- | Renders like @--context=num@, or @--context[=num]@ if the argument is
+-- optional
 data LongArg = LongArg
   { name :: String
   , argument :: Argument
diff --git a/src/Mdoc/Data/EnvVar.hs b/src/Mdoc/Data/EnvVar.hs
--- a/src/Mdoc/Data/EnvVar.hs
+++ b/src/Mdoc/Data/EnvVar.hs
@@ -25,7 +25,7 @@
 instance Pretty EnvVar where
   pretty e =
     mconcat
-      $ punctuate comma
+      $ punctuate ", "
       $ map ev (init e.names) <> [evArg $ last e.names]
    where
     -- All but last Ev without arg
diff --git a/src/Mdoc/Data/Flag.hs b/src/Mdoc/Data/Flag.hs
--- a/src/Mdoc/Data/Flag.hs
+++ b/src/Mdoc/Data/Flag.hs
@@ -31,6 +31,7 @@
       . punctuate " , "
       . mapFlag shortSwitch longSwitch
 
+-- | Render the first of a 'Flag', e.g. for @SYNOPSIS@
 newtype Flag1 = Flag1
   { unwrap :: Flag
   }
diff --git a/src/Mdoc/Data/Option.hs b/src/Mdoc/Data/Option.hs
--- a/src/Mdoc/Data/Option.hs
+++ b/src/Mdoc/Data/Option.hs
@@ -32,6 +32,7 @@
         (\s -> longArg s o.argument)
         o.flag
 
+-- | Render the first flag of an 'Option' with its argument, e.g. for @SYNOPSIS@
 newtype Option1 = Option1
   { unwrap :: Option
   }
diff --git a/src/Mdoc/Data/Positional.hs b/src/Mdoc/Data/Positional.hs
--- a/src/Mdoc/Data/Positional.hs
+++ b/src/Mdoc/Data/Positional.hs
@@ -65,6 +65,7 @@
   Flag c _ -> (1, [toLower c], isLower c)
   GNUFlag s _ -> (2, map toLower s, False)
 
+-- | Render a 'Positional' using 'Flag1' or 'Option1'
 newtype Positional1 = Positional1
   { unwrap :: Positional
   }