diff --git a/product-guide/CMakeLists.txt b/product-guide/CMakeLists.txt
index 9802c55..2d23021 100644
--- a/product-guide/CMakeLists.txt
+++ b/product-guide/CMakeLists.txt
@@ -27,11 +27,7 @@ project(${DIRNAME} VERSION 0 LANGUAGES )
 
 # File paths
 set(ADOC_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/manual.adoc")
-set(ADOC_EXTRAS 
-    "anms-components-logical.gv"
-    "anms-components-protocol.gv"
-    "anms-light-protocol.gv"
-)
+file(GLOB ADOC_EXTRAS "*.gv")
 
 
 find_program(ASCIIDOC asciidoctor REQUIRED)
@@ -51,11 +47,11 @@ add_custom_command(
     OUTPUT ${OUT_DBOOK}
     DEPENDS ${ADOC_SOURCE} ${ADOC_EXTRAS} ${OUT_DOCINFO}
     COMMAND
-        ${ASCIIDOC} -v -r asciidoctor-diagram
+        ${ASCIIDOC} -r asciidoctor-diagram
         --base-dir ${CMAKE_CURRENT_SOURCE_DIR}
         --destination-dir ${CMAKE_CURRENT_BINARY_DIR}
         -o ${OUT_DBOOK}
-    ${ADOC_SOURCE}
+        ${ADOC_SOURCE}
 )
 # Place source images into build directory
 set(INSTALL_IMGS ${CMAKE_CURRENT_SOURCE_DIR}/install_imgs.sh)
@@ -164,7 +160,7 @@ if(XMLSTARLET AND ASPELL)
             "${OUT_HTML}" "misspelling.txt"
         COMMAND
             ${XMLSTARLET} fo "${OUT_HTML}" |
-            grep --file "misspelling.txt" >"misspelling-ctx.txt" || true
+            grep --word-regexp --file "misspelling.txt" >"misspelling-ctx.txt" || true
     )
     add_custom_target(
         ${PROJECT_NAME}-misspelling ALL
diff --git a/product-guide/docinfo.xml.in b/product-guide/docinfo.xml.in
index 771fd11..9678eca 100644
--- a/product-guide/docinfo.xml.in
+++ b/product-guide/docinfo.xml.in
@@ -1,10 +1,12 @@
-<subtitle>DOC-005444, Prepared by The Johns Hopkins Applied Physics Laboratory</subtitle>
-<!-- <edition>@PROJECT_VERSION@</edition> -->
+<subtitle>DOC-005444</subtitle>
 <author>
-  <orgname>
-    JHU/APL
-  </orgname>
+  <personname>
+    <othername>
+Prepared by The Johns Hopkins University Applied Physics Laboratory
+    </othername>
+  </personname>
 </author>
+<releaseinfo></releaseinfo>
 <copyright>
   <year>2023-2026</year>
   <holder>The Johns Hopkins University Applied Physics Laboratory LLC</holder>
diff --git a/product-guide/pdf-opts.xsl b/product-guide/pdf-opts.xsl
index af963bb..9f9e6ca 100644
--- a/product-guide/pdf-opts.xsl
+++ b/product-guide/pdf-opts.xsl
@@ -6,6 +6,9 @@
   <xsl:param name="page.margin.inner">0.75in</xsl:param>
   <xsl:param name="page.margin.outer">0.75in</xsl:param>
 
+  <xsl:param name="draft.mode">no</xsl:param>
+  <xsl:param name="draft.watermark">yes</xsl:param>
+
   <xsl:param name="doc.collab.show">0</xsl:param>
   <xsl:param name="latex.output.revhistory">1</xsl:param>
   <xsl:param name="preface.tocdepth">2</xsl:param>
diff --git a/user-guide/CMakeLists.txt b/user-guide/CMakeLists.txt
index 04ee805..1f7bd25 100644
--- a/user-guide/CMakeLists.txt
+++ b/user-guide/CMakeLists.txt
@@ -47,11 +47,11 @@ add_custom_command(
     OUTPUT ${OUT_DBOOK}
     DEPENDS ${ADOC_SOURCE} ${ADOC_EXTRAS} ${OUT_DOCINFO}
     COMMAND
-        ${ASCIIDOC} -v -r asciidoctor-diagram
+        ${ASCIIDOC} -r asciidoctor-diagram
         --base-dir ${CMAKE_CURRENT_SOURCE_DIR}
         --destination-dir ${CMAKE_CURRENT_BINARY_DIR}
         -o ${OUT_DBOOK}
-    ${ADOC_SOURCE}
+        ${ADOC_SOURCE}
 )
 # Place source images into build directory
 set(INSTALL_IMGS ${CMAKE_CURRENT_SOURCE_DIR}/install_imgs.sh)
@@ -160,7 +160,7 @@ if(XMLSTARLET AND ASPELL)
             "${OUT_HTML}" "misspelling.txt"
         COMMAND
             ${XMLSTARLET} fo "${OUT_HTML}" |
-            grep --file "misspelling.txt" >"misspelling-ctx.txt" || true
+            grep --word-regexp --file "misspelling.txt" >"misspelling-ctx.txt" || true
     )
     add_custom_target(
         ${PROJECT_NAME}-misspelling ALL
diff --git a/user-guide/docinfo.xml.in b/user-guide/docinfo.xml.in
index 67cba2d..3bca22a 100644
--- a/user-guide/docinfo.xml.in
+++ b/user-guide/docinfo.xml.in
@@ -1,10 +1,12 @@
-<subtitle>DOC-005443, Prepared by The Johns Hopkins Applied Physics Laboratory</subtitle>
-<!-- <edition>@PROJECT_VERSION@</edition> -->
+<subtitle>DOC-005443</subtitle>
 <author>
-  <orgname>
-    JHU/APL
-  </orgname>
+  <personname>
+    <othername>
+Prepared by The Johns Hopkins University Applied Physics Laboratory
+    </othername>
+  </personname>
 </author>
+<releaseinfo></releaseinfo>
 <copyright>
   <year>2023-2026</year>
   <holder>The Johns Hopkins University Applied Physics Laboratory LLC</holder>
diff --git a/user-guide/pdf-opts.xsl b/user-guide/pdf-opts.xsl
index af963bb..9f9e6ca 100644
--- a/user-guide/pdf-opts.xsl
+++ b/user-guide/pdf-opts.xsl
@@ -6,6 +6,9 @@
   <xsl:param name="page.margin.inner">0.75in</xsl:param>
   <xsl:param name="page.margin.outer">0.75in</xsl:param>
 
+  <xsl:param name="draft.mode">no</xsl:param>
+  <xsl:param name="draft.watermark">yes</xsl:param>
+
   <xsl:param name="doc.collab.show">0</xsl:param>
   <xsl:param name="latex.output.revhistory">1</xsl:param>
   <xsl:param name="preface.tocdepth">2</xsl:param>