diff --git a/base/database.php b/base/database.php
index 55fef28..c2c3d02 100644
--- a/base/database.php
+++ b/base/database.php
@@ -10,12 +10,12 @@ class DB extends PDO
   {
     $conn = null;
     try {
-      $dataAccess = parse_ini_file($config, true);
+      $dataAccess = parse_ini_file($config, true)["ZEDAT"];
 
       $conn = new PDO(
-        "mysql:host={$dataAccess["ZEDAT"]["host"]};dbname={$dataAccess["ZEDAT"]["database"]};charset={$dataAccess["ZEDAT"]["charset"]}",
-        $dataAccess["ZEDAT"]["user"],
-        $dataAccess["ZEDAT"]["passwd"],
+        "mysql:host={$dataAccess["host"]};dbname={$dataAccess["database"]};charset={$dataAccess["charset"]}",
+        $dataAccess["user"],
+        $dataAccess["passwd"],
         [
           PDO::ATTR_PERSISTENT => false,
           PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
diff --git a/homework/1/colourSelector/index.php b/homework/1/colourSelector/index.php
index d60346d..b0fa381 100644
--- a/homework/1/colourSelector/index.php
+++ b/homework/1/colourSelector/index.php
@@ -12,6 +12,7 @@
   // PHP
   include_once "../../../base/settings.php";
   include_once "../../../base/headers.php";
+  Headers::html();
 
   if (!isset($_COOKIE["validation"])) {
     setcookie("validation", "false");
@@ -25,8 +26,6 @@
       unset($colour);
     }
   }
-
-  Headers::html();
   ?>
 </head>
 
diff --git a/homework/1/themeSwitcher/index.php b/homework/1/themeSwitcher/index.php
index 6ccd8e0..5d8dec2 100644
--- a/homework/1/themeSwitcher/index.php
+++ b/homework/1/themeSwitcher/index.php
@@ -12,6 +12,7 @@
   // PHP
   include_once "../../../base/settings.php";
   include_once "../../../base/headers.php";
+  Headers::html();
 
   if (isset($_POST["theme"])) {
     $theme = $_POST["theme"];
@@ -21,8 +22,6 @@
   } else if (isset($_COOKIE["theme"])) {
     $theme = $_COOKIE["theme"];
   }
-
-  Headers::html();
   ?>
 
   <?php if (isset($theme) && $theme === "black") { ?>
diff --git a/tasks/counter/index.php b/tasks/counter/index.php
index 14a3fda..f271c81 100644
--- a/tasks/counter/index.php
+++ b/tasks/counter/index.php
@@ -12,6 +12,7 @@
   // PHP
   include_once "../../base/settings.php";
   include_once "../../base/headers.php";
+  Headers::html();
 
   $fh = fopen("./data/counter.txt", "r+");
   if (flock($fh, LOCK_EX)) {
@@ -27,8 +28,6 @@
   }
   flock($fh, LOCK_UN);
   fclose($fh);
-
-  Headers::html();
   ?>
   <h1>Visitor count: <?= $cnt ?></h1>
 </body>
diff --git a/tasks/functions/funktionen.php b/tasks/functions/funktionen.php
index 02b18ad..ccd8afe 100644
--- a/tasks/functions/funktionen.php
+++ b/tasks/functions/funktionen.php
@@ -10,6 +10,7 @@
   <?php
   include_once "../../base/settings.php";
   include_once "../../base/headers.php";
+  Headers::html();
 
   /* Aufgabe 1 (A)
 Programmieren Sie eine Funktion buildlink,
@@ -121,8 +122,6 @@ Details siehe Aufgabenstellung in Blackboard. */
 
   echo getHits("counter.txt");
   addHit("counter.txt");
-
-  Headers::html();
   ?>
 </body>
 
diff --git a/tasks/guestBook/data/data.json b/tasks/guestBook/data/data.json
index 65e1cc4..854754b 100644
--- a/tasks/guestBook/data/data.json
+++ b/tasks/guestBook/data/data.json
@@ -1 +1 @@
-[{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715338381,"title":"sdf","name":"dsaf","comment":"dsg"},{"time":1715339761,"title":"Witzige Aufgabe","name":"Kilian","comment":"nun ja, also das funktioniert ja schon recht gut gell."},{"time":1716539658,"title":"Progress Bar","name":"Kilian","comment":"Jetzt auch mit einem etwas geileren Progress Bar der einem die Character-Anzahl anzeigt.\r\nWesentlich geiler, wesentlich nicer, und Bootstraped"},{"time":1716541941,"title":"New layout","name":"Kilian","comment":"New folder structure"},{"time":1716545229,"title":"More consistent padding","name":"Kilian","comment":"More unified padding across the sections of the page"},{"time":1716545296,"title":"Inject","name":"Kilian","comment":"<?php echo \"injection time!\" ?>"},{"time":1716546110,"title":"JS Inject","name":"Kilian","comment":"<script>\r\nconsole.log(\"BAD\");\r\n<\/script\/>"},{"time":1716547636,"title":"Redirect","name":"Kilian","comment":"Correct redirect tag"},{"time":1716547857,"title":"Back to old","name":"Kilian","comment":"302 is apparently more common"}]
\ No newline at end of file
+[{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715337098,"title":"The first","name":"Kilian","comment":"The first comment on here."},{"time":1715338381,"title":"sdf","name":"dsaf","comment":"dsg"},{"time":1715339761,"title":"Witzige Aufgabe","name":"Kilian","comment":"nun ja, also das funktioniert ja schon recht gut gell."},{"time":1716539658,"title":"Progress Bar","name":"Kilian","comment":"Jetzt auch mit einem etwas geileren Progress Bar der einem die Character-Anzahl anzeigt.\r\nWesentlich geiler, wesentlich nicer, und Bootstraped"},{"time":1716541941,"title":"New layout","name":"Kilian","comment":"New folder structure"},{"time":1716545229,"title":"More consistent padding","name":"Kilian","comment":"More unified padding across the sections of the page"},{"time":1716545296,"title":"Inject","name":"Kilian","comment":"<?php echo \"injection time!\" ?>"},{"time":1716546110,"title":"JS Inject","name":"Kilian","comment":"<script>\r\nconsole.log(\"BAD\");\r\n<\/script\/>"},{"time":1716547636,"title":"Redirect","name":"Kilian","comment":"Correct redirect tag"},{"time":1716547857,"title":"Back to old","name":"Kilian","comment":"302 is apparently more common"},{"time":1717152497,"title":"Repositioned HTML Header call","name":"Kilian","comment":"As title says"}]
\ No newline at end of file
diff --git a/tasks/guestBook/index.php b/tasks/guestBook/index.php
index 8524598..68bcce3 100644
--- a/tasks/guestBook/index.php
+++ b/tasks/guestBook/index.php
@@ -17,6 +17,7 @@
   // PHP
   include_once "../../base/settings.php";
   include_once "../../base/headers.php";
+  Headers::html();
 
   session_start();
   $errors = $_SESSION["error"] ?? [];
@@ -38,8 +39,6 @@
   }
 
   $data = array_slice($json, $page * 9, 9);
-
-  Headers::html();
   ?>
 
   <div class="container-fluid p-0">
diff --git a/test/index.php b/test/index.php
index ee9f3c2..493d10a 100644
--- a/test/index.php
+++ b/test/index.php
@@ -22,7 +22,7 @@
 
   $stmt = $db->prepare($query);
   $stmt->execute();
-  $result = $stmt->fetchAll(PDO::FETCH_ASSOC);
+  $result = $stmt->fetchAll();
 
   DB::closeConnection($db);
   ?>