diff --git a/include/init.php b/include/init.php
index 06f8d44..9386210 100644
--- a/include/init.php
+++ b/include/init.php
@@ -4,7 +4,7 @@ $mmdvmconfigs = getMMDVMConfig();
 $logLinesMMDVM = getMMDVMLog();
 $reverseLogLinesMMDVM = $logLinesMMDVM;
 array_multisort($reverseLogLinesMMDVM,SORT_DESC);
-$lastHeard = getLastHeard($reverseLogLinesMMDVM);
+$lastHeard = getLastHeard($reverseLogLinesMMDVM, FALSE);
 if (defined("ENABLEYSFGATEWAY")) {
 		$YSFGatewayconfigs = getYSFGatewayConfig();
 		$logLinesYSFGateway = getYSFGatewayLog();
diff --git a/include/localtx.php b/include/localtx.php
index 368ad4e..6cd6e97 100644
--- a/include/localtx.php
+++ b/include/localtx.php
@@ -1,6 +1,6 @@
 <?php
 
-$localTXList = getHeardList($reverseLogLinesMMDVM);
+$localTXList = getHeardList($reverseLogLinesMMDVM, FALSE);
 //array_multisort($localTXList,SORT_DESC);
 
 ?>
diff --git a/include/sysinfo.php b/include/sysinfo.php
index 8463cfe..2d791d8 100644
--- a/include/sysinfo.php
+++ b/include/sysinfo.php
@@ -106,7 +106,7 @@
 			<tbody>
 				<tr>
 					<?php
-					if (constant("SHOWPOWERSTATE")) {
+					if (defined("SHOWPOWERSTATE")) {
 					?>
 					<th>Power</th>
 					<?php
@@ -129,7 +129,7 @@
 				</tr>
 				<tr class="gatewayinfo">
 					<?php
-					if (constant("SHOWPOWERSTATE")) {
+					if (defined("SHOWPOWERSTATE")) {
 					?>
 					<td><?php if ($pinStatus == POWERONLINESTATE ) {echo "online";} else {echo "on battery";} ?></td>
 					<?php
diff --git a/setup.php b/setup.php
index cfc9abf..a073be2 100644
--- a/setup.php
+++ b/setup.php
@@ -18,23 +18,24 @@ include "include/tools.php";
   </head>
   <body>
 <?php
-	if ($_GET['cmd'] =="writeconfig") {
-		if (!file_exists('./config')) {
-		    if (!mkdir('./config', 0777, true)) {
+	if (isset($_GET['cmd'])) {
+		if ( "writeconfig" == $_GET['cmd']) {
+			if (!file_exists('./config')) {
+			    if (!mkdir('./config', 0777, true)) {
 ?>
 <div class="alert alert-danger" role="alert">You forgot to give write-permissions to your webserver-user, see point 3 in <a href="linux-step-by-step.md">linux-step-by-step.md</a>!</div>
 
 <?php
-		    }
-		}
-		$configfile = fopen("config/config.php", 'w');
-		fwrite($configfile,"<?php\n");
-		fwrite($configfile,"# This is an auto-generated config-file!\n");
-		fwrite($configfile,"# Be careful, when manual editing this!\n\n");
-		fwrite($configfile,"date_default_timezone_set('UTC');\n");
-		fwrite($configfile, createConfigLines());
-		fwrite($configfile,"?>\n");
-		fclose($configfile);
+			    }
+			}
+			$configfile = fopen("config/config.php", 'w');
+			fwrite($configfile,"<?php\n");
+			fwrite($configfile,"# This is an auto-generated config-file!\n");
+			fwrite($configfile,"# Be careful, when manual editing this!\n\n");
+			fwrite($configfile,"date_default_timezone_set('UTC');\n");
+			fwrite($configfile, createConfigLines());
+			fwrite($configfile,"?>\n");
+			fclose($configfile);
 ?>
   <div class="page-header">
     <h1><small>MMDVM-Dashboard by DG9VH</small> Setup-Process</h1>
@@ -42,6 +43,7 @@ include "include/tools.php";
     <p><a href="index.php">Your dashboard is now available.</a></p>
   </div>
 <?php
+		}
 	} else {
 ?>
   <div class="page-header">
@@ -74,7 +76,7 @@ include "include/tools.php";
       </div>
       <div class="input-group">
         <span class="input-group-addon" id="ENABLEXTDLOOKUP" style="width: 300px">Enable extended lookup (show names)</span>
-        <div class="panel-body"><input type="checkbox" name="ENABLEXTDLOOKUP" <?php if (constant("ENABLEXTDLOOKUP")) echo "checked" ?>></div>
+        <div class="panel-body"><input type="checkbox" name="ENABLEXTDLOOKUP" <?php if (defined("ENABLEXTDLOOKUP")) echo "checked" ?>></div>
       </div>
       <div class="input-group">
         <span class="input-group-addon" id="DMRIDDATPATH" style="width: 300px">Path to DMR-ID-Database-File</span>
@@ -123,11 +125,11 @@ include "include/tools.php";
       </div>
       <div class="input-group">
         <span class="input-group-addon" id="SHOWPROGRESSBARS" style="width: 300px">Show progressbars</span>
-        <div class="panel-body"><input type="checkbox" name="SHOWPROGRESSBARS" <?php if (constant("SHOWPROGRESSBARS")) echo "checked" ?>></div>
+        <div class="panel-body"><input type="checkbox" name="SHOWPROGRESSBARS" <?php if (defined("SHOWPROGRESSBARS")) echo "checked" ?>></div>
       </div>
       <div class="input-group">
         <span class="input-group-addon" id="TEMPERATUREALERT" style="width: 300px">Enable CPU-temperature-warning</span>
-        <div class="panel-body"><input type="checkbox" name="TEMPERATUREALERT" <?php if (constant("TEMPERATUREALERT")) echo "checked" ?>></div>
+        <div class="panel-body"><input type="checkbox" name="TEMPERATUREALERT" <?php if (defined("TEMPERATUREALERT")) echo "checked" ?>></div>
       </div>
       <div class="input-group">
         <span class="input-group-addon" id="TEMPERATUREHIGHLEVEL" style="width: 300px">Warning temperature</span>
@@ -151,7 +153,7 @@ include "include/tools.php";
       </div>	  
       <div class="input-group">
         <span class="input-group-addon" id="SHOWPOWERSTATE" style="width: 300px">Show Powerstate (online or battery, wiringpi needed)</span>
-        <div class="panel-body"><input type="checkbox" name="SHOWPOWERSTATE" <?php if (constant("SHOWPOWERSTATE")) echo "checked" ?>></div>
+        <div class="panel-body"><input type="checkbox" name="SHOWPOWERSTATE" <?php if (defined("SHOWPOWERSTATE")) echo "checked" ?>></div>
       </div>
       <div class="input-group">
         <span class="input-group-addon" id="POWERONLINEPIN" style="width: 300px">GPIO pin to monitor:</span>
@@ -163,7 +165,7 @@ include "include/tools.php";
       </div>	  
       <div class="input-group">
         <span class="input-group-addon" id="SHOWQRZ" style="width: 300px">Show link to QRZ.com on Callsigns</span>
-        <div class="panel-body"><input type="checkbox" name="SHOWQRZ" <?php if (constant("SHOWQRZ")) echo "checked" ?>></div>
+        <div class="panel-body"><input type="checkbox" name="SHOWQRZ" <?php if (defined("SHOWQRZ")) echo "checked" ?>></div>
       </div>
       <div class="input-group">
       <span class="input-group-btn">
diff --git a/version.php b/version.php
index 2ab3535..d7cb857 100644
--- a/version.php
+++ b/version.php
@@ -1,3 +1,3 @@
 <?php
-define("VERSION", "20160916-4");
+define("VERSION", "20160917-1");
 ?>
