diff --git a/partials/footer.php b/partials/footer.php
index 73bb2b2..1e02bda 100644
--- a/partials/footer.php
+++ b/partials/footer.php
@@ -1,7 +1,7 @@
 </main>
 
 <footer><center><small>
-	&copy; 2023 Søren Peter Mørch
+	&copy; 2023 <?= $config['public_nick'] ?>
 </small></center></footer>
 
 </body>
diff --git a/partials/timeline.php b/partials/timeline.php
index 2e9e469..7fe2847 100644
--- a/partials/timeline.php
+++ b/partials/timeline.php
@@ -44,7 +44,7 @@
             
             ?>
                 <!--  (<a href="new_twt.php?hash=<?= $twt->hash ?>">via email</a>) TODO: mailto-link -->
-                <a href='./post/<?= $twt->hash ?>' class="right"><span title="<?= $twt->fullDate ?> "><?= $twt->displayDate ?></span></a>
+                <a href='<?= $baseURL ?>/post/<?= $twt->hash ?>' class="right"><span title="<?= $twt->fullDate ?> "><?= $twt->displayDate ?></span></a>
             </small>
         </div>
     </article>
diff --git a/private/config_template.ini b/private/config_template.ini
index eab8646..a84d7b2 100644
--- a/private/config_template.ini
+++ b/private/config_template.ini
@@ -30,6 +30,9 @@ timezone = "Europe/Copenhagen"
 
 twts_per_page = 50
 
+; E-mail for comments
+email = ""
+
 [security]
 ; Generate it with the TOTP module
 totp_digits = 10
@@ -39,9 +42,5 @@ totp_secret = "1234567890"
 ; In case it's in HTTP (not secure), set this to false
 secure_cookies = true
 
-; E-mail for comments
-email = ""
-
-
 ; Simple password for unnamed user
 password = ""
\ No newline at end of file
diff --git a/views/conv.php b/views/conv.php
index 0aafdcc..2369e56 100644
--- a/views/conv.php
+++ b/views/conv.php
@@ -12,13 +12,19 @@ if (!empty($id)) {
 
 $title = "Conversation: ".$id." - ".$title;
 
-include 'partials/header.php';
+include_once 'partials/header.php';
 ?>
 
 <h2>Conversation</h2>
 
 <p>Recent twts in reply to <a href="/post/<?= $id ?>">#<?= $id ?></a></p>
 
-<!-- PHP: GET TIMELIE  --><?php include 'partials/timeline.php'?>
+<!-- PHP: GET TIMELIE  --><?php include_once 'partials/timeline.php'?>
 
-<!-- PHP: GET FOOTER  --><?php include 'partials/footer.php';?>
\ No newline at end of file
+<?php
+if (isset($_SESSION['password'])) {
+    $textareaValue = "(#$id) ";
+    include 'views/new_twt.php';
+} ?>
+
+<!-- PHP: GET FOOTER  --><?php include_once 'partials/footer.php';?>
\ No newline at end of file
diff --git a/views/new_twt.php b/views/new_twt.php
index 5cf3d1b..ebef83d 100644
--- a/views/new_twt.php
+++ b/views/new_twt.php
@@ -24,7 +24,7 @@ if (!isset($_SESSION['password'])) {
 	exit();
 }
 
-$textareaValue = '';
+//$textareaValue = '';
 if (isset($_GET['hash'])) {
 	$hash = $_GET['hash'];
 	$textareaValue = "(#$hash) ";
@@ -59,8 +59,11 @@ if (isset($_POST['submit'])) {
 		date_default_timezone_set('UTC');
 	}
 
+	//$datetime = gmdate('Y-m-d\TH:i:s\Z', $date->format('U'));
+	//$twt = $datetime . "\t$new_post\n";
 	$twt = date('c') . "\t$new_post\n";
 
+
 	if (strpos($contents, NEW_TWT_MARKER) !== false) {
 		// Add the previous marker
 		// Take note that doesn't not work if twtxt file has CRLF line ending
diff --git a/views/post.php b/views/post.php
index 2dae8e2..42c532c 100644
--- a/views/post.php
+++ b/views/post.php
@@ -9,11 +9,11 @@ if (!empty($id)) {
 
 $title = "Post #".$id." - ".$title;
 
-include 'partials/header.php';
+include_once 'partials/header.php';
 ?>
 
 <!-- <h2>Post: #<?= $id ?></h2> -->
 
-<!-- PHP: GET TIMELIE  --><?php include 'partials/timeline.php'?>
+<!-- PHP: GET TIMELIE  --><?php include_once 'partials/timeline.php'?>
 
-<!-- PHP: GET FOOTER  --><?php include 'partials/footer.php';?>
\ No newline at end of file
+<!-- PHP: GET FOOTER  --><?php include_once 'partials/footer.php';?>
\ No newline at end of file