diff --git a/dhsn.typ b/dhsn.typ
index e087676..15fe0e7 100644
--- a/dhsn.typ
+++ b/dhsn.typ
@@ -47,14 +47,16 @@
     }
     outline(title: "Anhangverzeichnis", target: selector(figure).after(here()))
     pagebreak()
+
+    set figure(kind: raw, supplement: "Anhang")
+    counter(figure.where(kind: raw)).update(0)
+
+    [= #supplement <dhsn.addendum>]
+    body
+    pagebreak()
+  } else {
+    body
   }
-
-  set figure(kind: raw, supplement: "Anhang")
-  counter(figure.where(kind: raw)).update(0)
-
-  [= #supplement <dhsn.addendum>]
-  body
-  pagebreak()
 }
 #let dhsn(
   topic: "Thema der Arbeit",
@@ -83,6 +85,12 @@
   set heading(numbering: (..nums) => nums.pos().map(str).join("."))
 
   set bibliography(style: "harvard-cite-them-right", title: "Literaturverzeichnis")
+  set document(
+    title: topic,
+    author: author,
+    description: [#subtitle],
+    date: submission-date,
+  )
   set cite(form: "prose")
   show cite: c => {
     show "ohne Datum": "o.D."
@@ -202,7 +210,7 @@
   }
 
   context {
-    if (acros.get() != none and acros.get().len() > 0) {
+    if (_acronyms.final() != none and _acronyms.final().len() > 0) {
       {
         show heading: none
         heading(numbering: none)[Abkürzungsverzeichnis]