diff --git a/cpdfcommand.ml b/cpdfcommand.ml
index 3ee048a..faa9760 100644
--- a/cpdfcommand.ml
+++ b/cpdfcommand.ml
@@ -1711,7 +1711,7 @@ let setprintfontencoding s =
 let settypeset s =
   setop (Typeset s) ()
 
-let settypesetsubformat s =
+let setsubformat s =
   args.subformat <- Some (Cpdfua.subformat_of_string s)
 
 let settableofcontentstitle s =
@@ -2822,9 +2822,9 @@ let specs =
    ("-typeset",
      Arg.String settypeset,
      " Typeset a text file as a PDF");
-   ("-typeset-subformat",
-     Arg.String settypesetsubformat,
-     " Set subformat for typesetting");
+   ("-subformat",
+     Arg.String setsubformat,
+     " Set subformat");
    ("-composition",
      Arg.Unit (setop (Composition false)),
      " Show composition of PDF");
diff --git a/cpdfdraw.ml b/cpdfdraw.ml
index 8718f2d..9a4631c 100644
--- a/cpdfdraw.ml
+++ b/cpdfdraw.ml
@@ -662,7 +662,7 @@ let rec find_tree_contents a level = function
       if level = 1 then (rev a, t) else find_tree_contents a (level - 1) t
   | h::t -> find_tree_contents (h::a) level t
 
-let mstdebug = ref true
+let mstdebug = ref false
 
 let rec make_structure_tree pageobjnums (pn, ns, ei) pdf = function
   | [] -> []
diff --git a/cpdfmanual.tex b/cpdfmanual.tex
index 14fd41a..39e0d31 100644
--- a/cpdfmanual.tex
+++ b/cpdfmanual.tex
@@ -1,3 +1,5 @@
+%Document -subformat for -jpg, -png etc.
+%Document -subformat for -typeset
 \documentclass{book}
 % Edit here to produce cpdfmanual.pdf, cpdflibmanual.pdf, pycpdfmanual.pdf,
 % dotnetcpdflibmanual.pdf, jcpdflibmanual.pdf jscpdflibmanual.pdf etc.