diff --git a/hyperref-generic.dtx b/hyperref-generic.dtx
index bd3056c3..1bd24361 100644
--- a/hyperref-generic.dtx
+++ b/hyperref-generic.dtx
@@ -690,7 +690,7 @@
 % /D    & \meta{array of numbers} & dash pattern (lines/gaps) (default [3])
 % \end{tabular}
 %
-% \DecribeHypkey{pdfcreationdate}\DecribeHypkey{pdfmoddate}
+% \DescribeHypkey{pdfcreationdate}\DescribeHypkey{pdfmoddate}
 % Setting these keys is normally not needed. If they are used the values
 % are stored directly in the Info dictionary for |/Creationdate| and |/ModDate|.
 % The values are converted to strings but not processed further, so they should
@@ -3389,7 +3389,7 @@
     ,pdfview .initial:n  = {xyz}
   }
 %    \end{macrocode}
-
+% \end{hypkey}
 %\subsection{\enquote{MetaData keys}}
 % The following keys are relevant for the metadata: the info dictionary and
 % the xmp-metadata.
diff --git a/l3pdfdict.dtx b/l3pdfdict.dtx
index 12cb1aca..a665fab1 100644
--- a/l3pdfdict.dtx
+++ b/l3pdfdict.dtx
@@ -60,18 +60,18 @@
 % they work like them with a few PDF specific changes:
 % \begin{itemize}
 % \item The keys are always converted with \cs{str_convert_pdfname}
-% to get a correct PDF name,
-% \item key with empty values can not be added, but will be ignored
-% \item There is a dedicated function to output the property as space
+% to get a correct PDF name;
+% \item a key with a empty value can not be added, it will be ignored;
+% \item there is a dedicated function to output the property as space
 % separated list with keys with slash: \texttt{/key1 value1 /key2 value2}.
-%
+% \end{itemize}
 % Local and global dictionaries can be created.
 %
 % \subsection{User Commands}
 % \begin{function}[updated = 2020-12-03]
 %   {\pdfdict_new:n}
 %   \begin{syntax}
-%     \cs{pdfdict_new:n} \Arg{dictionary name}\\
+%     \cs{pdfdict_new:n} \Arg{dictionary name}
 %   \end{syntax}
 % This function create a new local or global dictionary. Which one depends on
 % \Arg{dictionary name}: If it begins with the standard |g| the dictionary is global.
@@ -95,7 +95,7 @@
 % \begin{function}[EXP,updated = 2020-12-03]
 %   {\pdfdict_name:n}
 %   \begin{syntax}
-%     \cs{pdfdict_name:n} \Arg{dictionary name}\\
+%     \cs{pdfdict_name:n} \Arg{dictionary name}
 %   \end{syntax}
 % These command expand to the internal name. With these commands
 % it is possible to use standard commands of the \texttt{prop} module
@@ -155,7 +155,7 @@
 %\begin{function}[EXP, pTF,updated = 2020-12-03]
 %   { \pdfdict_if_exist:n  }
 %   \begin{syntax}
-%     \cs{pdfdict_if_exist:n} \Arg{dictionary}\\
+%     \cs{pdfdict_if_exist:n} \Arg{dictionary}
 %   \end{syntax}
 %   This tests if the dictionary exists.
 % \end{function}
@@ -273,8 +273,8 @@
                 Names~of~dictionaries~should~start~with~'g_'~or~'l_' }
 
 %    \end{macrocode}
-
-
+%
+%
 % \subsection{Creating dictionaries}
 % \begin{variable}
 %    {\g_@@_names_seq,\g_@@_gnames_seq}
@@ -339,6 +339,7 @@
 %</package>
 %    \end{macrocode}
 % \end{macro}
+%
 % \begin{macro}
 %   {
 %     \@@_set_eq:nn,\pdfdict_set_eq:nn,
@@ -483,7 +484,7 @@
 %</package>
 %    \end{macrocode}
 % \end{macro}
-
+%
 % \begin{macro}
 %   {
 %     \@@_get:nnN, \pdfdict_get:nnN,
@@ -549,6 +550,7 @@
 %</package>
 %    \end{macrocode}
 % \end{macro}
+%
 % \begin{macro}
 %   { \@@_show:Nn, \pdfdict_show:n }
 % This allows to show the content of dictionaries. It also displays if a
@@ -592,6 +594,7 @@
 %</package>
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
 % \begin{macro}
 %   {
 %     \@@_use:n
diff --git a/l3pdftools.dtx b/l3pdftools.dtx
index 30b3fc43..1530b742 100644
--- a/l3pdftools.dtx
+++ b/l3pdftools.dtx
@@ -85,17 +85,17 @@
 %     \item[name] see above
 %     \item[name-print] see above
 %     \item[utf8/string]
-%      this converts with \cs{\str_set_convert:Nnnn} into utf8/string.
+%      this converts with \cs{str_set_convert:Nnnn} into utf8/string.
 %     \item[utf8/string-print]
 %      this converts into utf8/string and add parentheses around.%
 %     \item[utf8/URIpdf]
-%      this converts with \cs{\str_set_convert:Nnnn} into utf8/url and
+%      this converts with \cs{str_set_convert:Nnnn} into utf8/url and
 %      then replace reserved and digits back from the percent encoding. Parentheses
 %      are escaped.
 %     \item[utf8/url-print]
 %      this converts into utf8/URIpdf  and add parentheses around.%
 %     \item[utf16/string]
-%      this converts with \cs{\str_set_convert:Nnnn} into utf16/string.
+%      this converts with \cs{str_set_convert:Nnnn} into utf16/string.
 %     \item[utf16/string-print]
 %      this converts into utf16/string and add parentheses around.
 %     \item[utf16/hex]
@@ -310,7 +310,6 @@
     \prop_gput:Nnn \g__str_alias_prop { default } { utf8 }
   }
 %    \end{macrocode}
-% \end{variable}
 % Most converter are simply wrapper around the str-convert commands and so
 % use the same name.
 % The exception is the one for url's: it reverts most of the percent encodings
diff --git a/pdfmanagement-firstaid.dtx b/pdfmanagement-firstaid.dtx
index 16da10c0..50610dfb 100644
--- a/pdfmanagement-firstaid.dtx
+++ b/pdfmanagement-firstaid.dtx
@@ -30,7 +30,7 @@
 %</driver>
 % \fi
 % \title{^^A
-%   The \pkg{pdfmanagement-firstaid} package  -- temporarly patches and package replacements  ^^A
+%   The \pkg{pdfmanagement-firstaid} package  -- temporary patches and package replacements  ^^A
 % }
 %
 % \author{^^A
@@ -108,7 +108,9 @@
     \msg_info:nnn{pdfmanagement }{firstaid}{pgf}
     \AddToHook{file/after/pgfrcs.sty}
       {
-        \cs_set_eq:NN \@@_pgfori_pgfutil@setuppdfresources\pgfutil@setuppdfresources
+        \cs_set_eq:NN
+          \@@_pgfori_pgfutil@setuppdfresources
+          \pgfutil@setuppdfresources
         \def\pgfutil@setuppdfresources
           {
             \pdfmanagement_if_active:TF
@@ -168,16 +170,21 @@
 
 \cs_new:Npn \@@_patch_pgfextgs:w  #1/#2<<#3>>#4\q_stop
   {
-    \exp_args:Nne \__pdf_backend_PageResources_gput:nnn {ExtGState}{\tl_trim_spaces:n{#2}}{<<#3>>}
+    \exp_args:Nne
+      \__pdf_backend_PageResources_gput:nnn
+        {ExtGState}{\tl_trim_spaces:n{#2}}{<<#3>>}
   }
 \cs_new:Npn \@@_patch_pgfpatterns:w  #1/#2\space#3\q_stop
   {
-    \exp_args:Nnxx \__pdf_backend_PageResources_gput:nnn {Pattern}{\tl_trim_spaces:n{#2}}{#3}
+    \exp_args:Nnxx
+      \__pdf_backend_PageResources_gput:nnn
+        {Pattern}{\tl_trim_spaces:n{#2}}{#3}
   }
 \cs_new:Npn \@@_patch_pgfcolorspaces:w  #1/#2[#3]#4\q_stop
   {
     \exp_args:Nne
-    \__pdf_backend_PageResources_gput:nnn {ColorSpace}{\tl_trim_spaces:n{#2}}{[#3]}
+    \__pdf_backend_PageResources_gput:nnn
+      {ColorSpace}{\tl_trim_spaces:n{#2}}{[#3]}
   }
 
 %    \end{macrocode}
@@ -259,4 +266,5 @@
   }
 %</package>
 %    \end{macrocode}%
+% \end{documentation}
 % \PrintIndex
diff --git a/pdfmanagement.dtx b/pdfmanagement.dtx
index 389cc34f..9da8b81a 100644
--- a/pdfmanagement.dtx
+++ b/pdfmanagement.dtx
@@ -216,6 +216,7 @@
 % bcd/emc.  It will probably disappear. It is loaded by the bundle, and
 % should not be loaded independently.
 %
+% \end{description}
 % \section{Incompabilities}
 %
 % As described in section~\ref{sec:change}, if activated
@@ -265,21 +266,28 @@
 % but it is not complete currently. Failures are e.g. possible with complicated
 % author or title settings.
 %
+% This can be disabled by using |firstaidoff=hyperxmp| in \cs{DeclareDocumentmetadata}
+% 
 % \subsection{tikz/pgf}
 % \pkg{pgf} writes to the page resources too and so is incompatible. The needed
 % changes are rather small and will be done in coordination with the maintainer.
-% Until this works, \pkg{pagemanagement} can be loaded with the option \texttt{patches}
-% which will add the needed patches.
+%
+% Until this works, \pkg{pagemanagement} will load the patches automatically.
+%
+% This can be disabled by using |firstaidoff=pgf| in \cs{DeclareDocumentmetadata}
 %
 % \subsection{transparent}
 % The package \pkg{transparent} is incompatible. A replacement has been written
 % (\pkg{transparent-ltx}) and is loaded automatically. It requires a very recent
 % l3 layer!
 %
+% This can be disabled by using |firstaidoff=transparent| in \cs{DeclareDocumentmetadata}
 % \subsection{pdflscape}
 % The package \pkg{pdflscape} is incompatible. A replacement has been written
 % (\pkg{pdflscape-ltx}) and is loaded automatically.
 %
+% This can be disabled by using |firstaidoff=pdflscape| in \cs{DeclareDocumentmetadata}
+%
 % \subsection{colorspace}
 % The package is incompatible. It works more or less with the option \texttt{patches}.
 % Alternative code for spot colors is under development