diff --git a/web/install/update_400-410.php b/web/install/update_400-410.php
index 65038916..088af1b6 100644
--- a/web/install/update_400-410.php
+++ b/web/install/update_400-410.php
@@ -87,9 +87,9 @@ if (isset($include) and $include == true) {
 <li>Autoupdater für Minecraft Craft Bukkit hinzugefügt</li>
 <li>Im Falle eines Totalverlustes des Roots können alle Gameserver mit einem Klick neu erstellt werden</li>
 </ul></li>
-<li>MYSQL:
+<li>MySQL:
 <ul>
-<li>Beschreibung kann bei MYSQL Datenbanken mit angegeben werden</li>
+<li>Beschreibung kann bei MySQL Datenbanken mit angegeben werden</li>
 </ul></li>
 <li>Voiceserver:
 <ul>
@@ -109,7 +109,7 @@ if (isset($include) and $include == true) {
 <li>Validator beim Editieren der eigenen Userdaten korrigiert</li>
 <li>Veraltete Icons in der Protectionabfrage des CMS ersetzt</li>
 <li>Leihserverübersicht im CMS wird korrekt dargestellt</li>
-<li>MYSQL Modul verwaltet die Datenbankuser korrekt</li>
+<li>MySQL Modul verwaltet die Datenbankuser korrekt</li>
 <li>Erfolgreiches Anlegen eines Vertreters gibt nun den Erfolg an den User zurück</li>
 <li>Fehlendes Template admin_voicemasterserver_dltpl hinzugefügt</li>
 <li>Reinstall von Gameservern im Adminpanel korrigiert</li>
@@ -158,9 +158,9 @@ if (isset($include) and $include == true) {
 <li>Added Minecraft Craft Bukkit autoupdater</li>
 <li>In case a whole rootserver is lost and replaced all users and server can be recreated with one click</li>
 </ul></li>
-<li>MYSQL:
+<li>MySQL:
 <ul>
-<li>Description can be added with a MYSQL database</li>
+<li>Description can be added with a MySQL database</li>
 </ul></li>
 <li>User:
 <ul>
@@ -188,7 +188,7 @@ if (isset($include) and $include == true) {
 <li>Correct validator used in case of editing own userdata</li>
 <li>Outdated icons replaced at protectioncheck within the CMS</li>
 <li>Lendserver overview is displayed correctly at CMS</li>
-<li>MYSQL module maintains DB users without errors</li>
+<li>MySQL module maintains DB users without errors</li>
 <li>Success message in case of adding a substitute</li>
 <li>Added missing template admin_voicemasterserver_dltpl</li>
 <li>Corrected reinstall gameservern at adminpanel</li>
diff --git a/web/jobs.php b/web/jobs.php
index ebccce0a..39f84ec1 100644
--- a/web/jobs.php
+++ b/web/jobs.php
@@ -165,46 +165,46 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip,
         updateStates('md');
         $counJobs->execute();
         $jobCount = $counJobs->rowCount();
-        print "\r\n".'Total jobs open after cleanup: '.$jobCount."\r\n";
+        print "\r\n" . 'Total jobs open after cleanup: '.$jobCount."\r\n";
         print 'Executing user cleanup jobs'."\r\n";
-        $startTime=strtotime('now');
-        $theOutput=new runGraph($jobCount,$newLine);
+        $startTime = strtotime('now');
+        $theOutput = new runGraph($jobCount,$newLine);
         # us > vo > gs > my > vs
         include(EASYWIDIR . '/stuff/jobs_user.php');
         $counJobs->execute();
         $jobCount = $counJobs->rowCount();
         $theOutput->updateCount($jobCount);
-        print "\r\n".'Total jobs open after user cleanup jobs are done: '.$jobCount."\r\n";
+        print "\r\n" . 'Total jobs open after user cleanup jobs are done: '.$jobCount."\r\n";
         print 'Executing voice jobs'."\r\n";
         include(EASYWIDIR . '/stuff/jobs_voice.php');
         $counJobs->execute();
         $jobCount = $counJobs->rowCount();
         $theOutput->updateCount($jobCount);
-        print "\r\n".'Total jobs open after voice jobs are done: '.$jobCount."\r\n";
+        print "\r\n" . 'Total jobs open after voice jobs are done: '.$jobCount."\r\n";
         print 'Executing TS DNS jobs'."\r\n";
         include(EASYWIDIR . '/stuff/jobs_tsdns.php');
         $counJobs->execute();
         $jobCount = $counJobs->rowCount();
         $theOutput->updateCount($jobCount);
-        print "\r\n".'Total jobs open after TS DNS jobs are done: '.$jobCount."\r\n";
+        print "\r\n" . 'Total jobs open after TS DNS jobs are done: '.$jobCount."\r\n";
         print 'Executing mysql jobs'."\r\n";
         include(EASYWIDIR . '/stuff/jobs_mysql.php');
         $counJobs->execute();
         $jobCount = $counJobs->rowCount();
         $theOutput->updateCount($jobCount);
-        print "\r\n".'Total jobs open after mysql jobs are done: '.$jobCount."\r\n";
+        print "\r\n" . 'Total jobs open after mysql jobs are done: '.$jobCount."\r\n";
         print 'Executing gameserver jobs'."\r\n";
         include(EASYWIDIR . '/stuff/jobs_gserver.php');
         $counJobs->execute();
         $jobCount = $counJobs->rowCount();
         $theOutput->updateCount($jobCount);
-        print "\r\n".'Total jobs open after gameserver jobs are done: '.$jobCount."\r\n";
+        print "\r\n" . 'Total jobs open after gameserver jobs are done: '.$jobCount."\r\n";
         print 'Executing root server jobs'."\r\n";
         include(EASYWIDIR . '/stuff/jobs_roots.php');
         $counJobs->execute();
         $jobCount = $counJobs->rowCount();
         $theOutput->updateCount($jobCount);
-        print "\r\n".'Total jobs open after root server jobs are done: '.$jobCount."\r\n";
+        print "\r\n" . 'Total jobs open after root server jobs are done: '.$jobCount."\r\n";
         print 'Executing user remove jobs'."\r\n";
         include(EASYWIDIR . '/stuff/jobs_user_rm.php');
         print "\n";
@@ -221,7 +221,7 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip,
                 $sql->setAttribute(PDO::ATTR_ERRMODE,PDO::ERRMODE_EXCEPTION);
             }
             flush();
-            print "\r\n".'Deamon run finished. Current memory usage is: '.memory_get_usage().' Bytes. Waiting '.$sleep.' seconds before next job run'."\r\n\r\n";
+            print "\r\n" . 'Deamon run finished. Current memory usage is: '.memory_get_usage().' Bytes. Waiting '.$sleep.' seconds before next job run'."\r\n\r\n";
             sleep($sleep);
         } else {
             $runJobs = false;
diff --git a/web/js/default/main.js b/web/js/default/main.js
index f3e2ae41..11210d8a 100644
--- a/web/js/default/main.js
+++ b/web/js/default/main.js
@@ -271,4 +271,4 @@ function post_data (target,id_array) {
     document.body.appendChild(invisibleTempForm);
     invisibleTempForm.submit();
     document.body.removeChild(invisibleTempForm);
-}
+}
\ No newline at end of file
diff --git a/web/stuff/admin_modules.php b/web/stuff/admin_modules.php
index 1dc76378..ae0c9bc6 100644
--- a/web/stuff/admin_modules.php
+++ b/web/stuff/admin_modules.php
@@ -56,7 +56,7 @@ unset($name);
 $table = array(
     1 => array('id' =>1, 'active' => 'Y', 'name' => $gsprache->gameserver, 'sub' => 'gs', 'type' => $sprache->type_core),
     2 => array('id' =>2, 'active' => 'Y', 'name' => 'Easy Anti Cheat', 'sub' => 'ea', 'type' => $sprache->type_core),
-    3 => array('id' =>3, 'active' => 'Y', 'name' => 'MYSQL', 'sub' => 'my', 'type' => $sprache->type_core),
+    3 => array('id' =>3, 'active' => 'Y', 'name' => 'MySQL', 'sub' => 'my', 'type' => $sprache->type_core),
     4 => array('id' =>4, 'active' => 'Y', 'name' => $gsprache->voiceserver, 'sub' => 'vo', 'type' => $sprache->type_core),
     5 => array('id' =>5, 'active' => 'Y', 'name' => $gsprache->lendserver, 'sub' => 'le', 'type' => $sprache->type_core),
     6 => array('id' =>6, 'active' => 'Y', 'name' => $gsprache->support, 'sub' => 'ti', 'type' => $sprache->type_core),
diff --git a/web/stuff/init_admin.php b/web/stuff/init_admin.php
index b5f31b29..9dbecbda 100644
--- a/web/stuff/init_admin.php
+++ b/web/stuff/init_admin.php
@@ -92,7 +92,7 @@ $what_to_be_included_array = array(
     'ap' => 'api_settings.php', 'aa' => 'api_external_auth.php', 'ui' => 'api_import_users.php', 'jb' => 'jobs_list.php', 'bu' => 'mysql_root.php',
     'vc' => 'versioncheck.php', 'ib' => 'ip_bans.php', 'se' => 'panel_settings.php', 'cc' => 'panel_settings_columns.php', 'sm' => 'panel_settings_email.php', 'lo' => 'logdata.php', 'ml' => 'maillog.php', 'sr' => 'admin_search.php',
     'us' => 'user.php', 'ug' => 'user_groups.php',
-    'ip' => 'imprint.php', 'su' => 'global_userdata.php'
+    'su' => 'global_userdata.php'
 );
 
 if ($reseller_id == 0) {
@@ -104,7 +104,7 @@ if ($reseller_id == 0) {
     $what_to_be_included_array['pd'] = 'page_downloads.php';
 }
 
-$easywiModules = array('gs' => true, 'ea' => true, 'my' => true, 'ro' => true, 'ti' => true, 'le' => true, 'vo' => true);
+$easywiModules = array('gs' => true, 'ip' => true, 'ea' => true, 'my' => true, 'ro' => true, 'ti' => true, 'le' => true, 'vo' => true);
 $customModules = array('gs' => array(), 'mo' => array(), 'my' => array(), 'ro' => array(), 'ti' => array(), 'us' => array(), 'vo' => array(), 'pa' => array());
 
 $query = $sql->prepare("SELECT * FROM `modules` WHERE `type` IN ('A','C')");
@@ -172,4 +172,8 @@ if ($easywiModules['vo'] === true) {
     $what_to_be_included_array['vd'] = 'voice_tsdns.php';
     $what_to_be_included_array['vr'] = 'voice_tsdnsrecords.php';
     $what_to_be_included_array['vm'] = 'voice_master.php';
+}
+
+if ($easywiModules['ip'] === true) {
+    $what_to_be_included_array['ip'] = 'imprint.php';
 }
\ No newline at end of file
diff --git a/web/stuff/init_page.php b/web/stuff/init_page.php
index 066296f1..0367ef12 100644
--- a/web/stuff/init_page.php
+++ b/web/stuff/init_page.php
@@ -53,6 +53,48 @@ if (!isurl($pageurl) or (!isdomain($pageurl) and (!isurl($pageurl)))) {
 $page_sprache = getlanguagefile('page', $user_language, 0);
 $page_data = new PageSettings($user_language, $pageurl, $seo);
 
+
+
+
+$easywiModules = array('gs' => true, 'ip' => true, 'ea' => true, 'my' => true, 'ro' => true, 'ti' => true, 'le' => true, 'vo' => true);
+$customModules = array('gs' => array(), 'mo' => array(), 'my' => array(), 'ro' => array(), 'ti' => array(), 'us' => array(), 'vo' => array(), 'pa' => array());
+
+$query = $sql->prepare("SELECT * FROM `modules` WHERE `type` IN ('P','C')");
+$query2 = $sql->prepare("SELECT `text` FROM `translations` WHERE `type`='mo' AND `transID`=? AND `lang`=? LIMIT 1");
+$query->execute();
+foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
+    if ($row['active'] == 'Y' and $row['type'] == 'A' and is_file(EASYWIDIR . '/stuff/' . $row['file'])) {
+        $query2->execute(array($row['id'], $user_language));
+        $name = $query2->fetchColumn();
+
+        if (strlen($name) == 0) {
+            $query2->execute(array($row['id'], $rSA['language']));
+            $name = $query2->fetchColumn();
+        }
+        if (strlen($name) == 0) {
+            $name = $row['file'];
+        }
+
+        $customModules[$row['sub']][$row['get']] = $name;
+        $what_to_be_included_array[$row['get']] = $row['file'];
+
+    } else if ($row['type'] == 'C' and $row['active'] == 'N') {
+        $easywiModules[$row['get']] = false;
+    }
+}
+
+$what_to_be_included_array = array('news' => 'page_news.php','contact' => 'page_contact.php',
+    'page' => 'page_page.php','home' => 'page_page.php','about' => 'page_page.php','gallery' => 'page_page.php','sitemap' => 'page_page.php','search' => 'page_page.php',
+    'tag' => 'page_tag.php','categories' => 'page_tag.php','downloads' => 'page_download.php',
+    'lendserver' => 'lend.php',
+    'protectioncheck' => 'protectioncheck.php',
+    'register' => 'page_register.php'
+);
+
+if ($easywiModules['ip'] === true) {
+    $what_to_be_included_array['ip'] = 'imprint.php';
+}
+
 $query = $sql->prepare("SELECT `active`,`activeGS`,`activeVS` FROM `lendsettings` WHERE `resellerid`=0 LIMIT 1");
 $query->execute();
 foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
@@ -66,10 +108,10 @@ $page_data->SetData('title', $title);
 
 $query = $sql->prepare("SELECT p.`id`,p.`subpage`,p.`naviDisplay`,t.`title` FROM `page_pages` p LEFT JOIN `page_pages_text` t ON p.`id`=t.`pageid` WHERE p.`released`='1' AND p.`type`='page' AND t.`language`=? AND p.`resellerid`='0' ORDER BY `subpage`,`sort`");
 $query->execute(array($user_language));
-if ($seo== 'Y') {
+if ($seo == 'Y') {
     $page_data->SetMenu($gsprache->news, $gsprache->news,'news');
 
-    if ($protectioncheck== 'Y') {
+    if ($protectioncheck == 'Y') {
         $page_data->SetMenu($page_sprache->protectioncheck, $page_sprache->protectioncheck,'protectioncheck');
     }
 
@@ -101,7 +143,6 @@ if ($seo== 'Y') {
     foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
         if ($row['naviDisplay'] == 'Y') {
             $page_data->SetMenu($row['title'], $row['title'], $row['subpage'], $row['id']);
-
         } else {
             $page_data->SetMenu($row['title'], $row['title'], $row['subpage'], $row['id'], false);
         }
@@ -222,19 +263,11 @@ if (isset($page_lookupid)) {
     }
 }
 if (!isset($s) and !isset($page_category) and isset($page_default) and isid($page_default,19)) {
-    $s='page';
+    $s = 'page';
     $default_page_id = $page_default;
 } else if (!isset($s) and !isset($page_category) and isset($page_default)) {
     $s = $page_default;
 } else if (!isset($s) and isset($page_category) and $page_category != '' and $page_category != null) {
-    $s='404';
+    $s = 404;
     $throw404 = true;
-}
-$what_to_be_included_array=array('news' => 'page_news.php','contact' => 'page_contact.php',
-    'page' => 'page_page.php','home' => 'page_page.php','about' => 'page_page.php','gallery' => 'page_page.php','sitemap' => 'page_page.php','search' => 'page_page.php',
-    'tag' => 'page_tag.php','categories' => 'page_tag.php','downloads' => 'page_download.php',
-    'lendserver' => 'lend.php',
-    'protectioncheck' => 'protectioncheck.php',
-    'imprint' => 'imprint.php',
-    'register' => 'page_register.php'
-);
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/web/stuff/init_user.php b/web/stuff/init_user.php
index c3d281e8..0c418063 100644
--- a/web/stuff/init_user.php
+++ b/web/stuff/init_user.php
@@ -50,7 +50,6 @@ $query->execute();
 $statusTime = ceil($query->fetchColumn());
 $gsprache->help_home = str_replace('%n%', $statusTime, $gsprache->help_home);
 $gsprache->help_sidebar = str_replace('%n%', $statusTime, $gsprache->help_sidebar);
-$gsprache->greating_home = str_replace('%name%', $ewCfg['title'], $gsprache->greating_home);
 
 # https://github.com/easy-wi/developer/issues/2
 if (isset($_SESSION['sID'])) {
@@ -113,7 +112,10 @@ if (isset($_SESSION['sID'])) {
     $query->execute(array($user_id));
     $virtualcount = $query->fetchColumn();
     
-    if (!isset($reseller_id)) $reseller_id = 0;
+    if (!isset($reseller_id)) {
+        $reseller_id = 0;
+    }
+
 	if (isset($admin_id) and $admin_id==$reseller_id) {
 		$resellerid = 0;
 	} else if (isset($reseller_id)) {
@@ -121,14 +123,6 @@ if (isset($_SESSION['sID'])) {
 	} else {
 		$resellerid = 0;
 	}
-	$query = $sql->prepare("SELECT `imprint` FROM `imprints` WHERE language=? AND resellerid=? LIMIT 1");
-	$query->execute(array($user_language,$resellerid));
-	if (strlen($query->fetchColumn())>1) {
-		$showImprint=true;
-	}
-	else {
-		$showImprint=false;
-	}
 }
 
 if (isset($lastlogin) and $lastlogin != null and $lastlogin != '0000-00-00 00:00:00') {
@@ -139,10 +133,10 @@ if (isset($lastlogin) and $lastlogin != null and $lastlogin != '0000-00-00 00:00
 
 # https://github.com/easy-wi/developer/issues/61
 # basic modules array. available at any time to anyone
-$what_to_be_included_array = array('ip' => 'imprint.php','lo' => 'userpanel_logdata.php','ti' => 'userpanel_tickets.php');
+$what_to_be_included_array = array('lo' => 'userpanel_logdata.php','ti' => 'userpanel_tickets.php');
 
 
-$easywiModules = array('gs' => true, 'my' => true, 'ro' => true, 'ti' => true, 'le' => true, 'vo' => true);
+$easywiModules = array('gs' => true, 'ip' => true, 'my' => true, 'ro' => true, 'ti' => true, 'le' => true, 'vo' => true);
 $customModules = array('gs' => array(), 'mo' => array(), 'my' => array(), 'ro' => array(), 'ti' => array(), 'us' => array(), 'vo' => array());
 
 $query = $sql->prepare("SELECT * FROM `modules` WHERE `type` IN ('U','C')");
@@ -206,4 +200,8 @@ if ($virtualcount > 0 and $easywiModules['ro'] === true) {
 
 if ($dbcount > 0 and $easywiModules['my'] === true) {
     $what_to_be_included_array['my'] = 'userpanel_mysql.php';
+}
+
+if ($easywiModules['ip'] === true) {
+    $what_to_be_included_array['ip'] = 'imprint.php';
 }
\ No newline at end of file
diff --git a/web/stuff/jobs_list.php b/web/stuff/jobs_list.php
index 5bd9ef22..01bb81eb 100644
--- a/web/stuff/jobs_list.php
+++ b/web/stuff/jobs_list.php
@@ -128,7 +128,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
         $query = $sql->prepare("SELECT * FROM `jobs` $where ORDER BY $orderby LIMIT $start,$amount");
         $query->execute(array($reseller_id));
     }
-    $type=array('de' => $gsprache->dedicated,'ds' => 'TS3 DNS','gs' => $gsprache->gameserver,'my' => 'MYSQL','us' => $gsprache->user,'vo' => $gsprache->voiceserver,'vs' => $gsprache->virtual);
+    $type=array('de' => $gsprache->dedicated,'ds' => 'TS3 DNS','gs' => $gsprache->gameserver,'my' => 'MySQL','us' => $gsprache->user,'vo' => $gsprache->voiceserver,'vs' => $gsprache->virtual);
     foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
         if ($user_language == 'de') {
             $date=date('Y-d-m H:m:s',strtotime($row['date']));
diff --git a/web/stuff/jobs_mysql.php b/web/stuff/jobs_mysql.php
index ca96f39b..59b1cdec 100644
--- a/web/stuff/jobs_mysql.php
+++ b/web/stuff/jobs_mysql.php
@@ -70,16 +70,16 @@ foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
                 $max_connections_per_hour = $row['max_connections_per_hour'];
                 $max_userconnections_per_hour = $row['max_userconnections_per_hour'];
                 if ($row2['action'] == 'dl') {
-                    $command = $gsprache->del.' MYSQLDBID: '.$row2['affectedID'].' DBName: '.$row['dbname'];
+                    $command = $gsprache->del.' MySQLDBID: '.$row2['affectedID'].' DBName: '.$row['dbname'];
                     $remotesql->DelDB($dbname);
                     $delete = $sql->prepare("DELETE FROM `mysql_external_dbs` WHERE `id`=? LIMIT 1");
                     $delete->execute(array($row2['affectedID']));
                     customColumns('M', $row2['affectedID'], 'del');
                 } else if ($row2['action'] == 'ad') {
-                    $command = $gsprache->add.' MYSQLDBID: '.$row2['affectedID'].' DBName: '.$row['dbname'];
+                    $command = $gsprache->add.' MySQLDBID: '.$row2['affectedID'].' DBName: '.$row['dbname'];
                     $remotesql->AddDB($dbname,$password,$ips,$max_queries_per_hour,$max_connections_per_hour,$max_updates_per_hour,$max_userconnections_per_hour);
                 } else {
-                    $command = $gsprache->mod.' MYSQLDBID: '.$row2['affectedID'].' DBName: '.$row['dbname'];
+                    $command = $gsprache->mod.' MySQLDBID: '.$row2['affectedID'].' DBName: '.$row['dbname'];
                     $remotesql->ModDB($dbname,$password,$ips,$max_queries_per_hour,$max_connections_per_hour,$max_updates_per_hour,$max_userconnections_per_hour);
                 }
                 $theOutput->printGraph($command);
diff --git a/web/stuff/jobs_user.php b/web/stuff/jobs_user.php
index d093603b..a99a6c50 100644
--- a/web/stuff/jobs_user.php
+++ b/web/stuff/jobs_user.php
@@ -40,39 +40,47 @@
 $query = $sql->prepare("SELECT * FROM `jobs` WHERE (`status` IS NULL OR `status`='1') AND `type`='us'");
 $query->execute();
 foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
+
     if ($row['action'] == 'dl') {
-        $command = $gsprache->del.' cleanup userID: '.$row['affectedID'].' name:'.$row['name'];
+        $command = $gsprache->del.' cleanup userID: ' . $row['affectedID'] . ' name:' . $row['name'];
     } else if ($row['action'] == 'ad') {
-        $command = $gsprache->add.' userID: '.$row['affectedID'].' name:'.$row['name'];
+        $command = $gsprache->add.' userID: ' . $row['affectedID'] . ' name:' . $row['name'];
     } else {
-        $command = $gsprache->mod.' userID: '.$row['affectedID'].' name:'.$row['name'];
+        $command = $gsprache->mod.' userID: ' . $row['affectedID'] . ' name:' . $row['name'];
     }
+
     $query2 = $sql->prepare("SELECT `id`,`rootID`,`serverip`,`port`,`resellerid` FROM `gsswitch` WHERE `userid`=?");
     $query2->execute(array($row['affectedID']));
     $insert = $sql->prepare("INSERT INTO `jobs` (`api`,`type`,`invoicedByID`,`affectedID`,`hostID`,`userID`,`name`,`status`,`date`,`action`,`extraData`,`resellerid`) VALUES ('S','gs',?,?,?,?,?,NULL,NOW(),?,?,?)");
     foreach ($query2->fetchAll(PDO::FETCH_ASSOC) as $row2) {
         $insert->execute(array($row['invoicedByID'], $row2['id'], $row2['rootID'], $row['affectedID'], $row2['serverip'] . ':' . $row2['port'], $row['action'], $row['extraData'], $row2['resellerid']));
     }
+
     $query2 = $sql->prepare("SELECT `id`,`masterserver`,`ip`,`port`,`resellerid` FROM `voice_server` WHERE `userid`=?");
     $query2->execute(array($row['affectedID']));
     $insert = $sql->prepare("INSERT INTO `jobs` (`api`,`type`,`invoicedByID`,`affectedID`,`hostID`,`userID`,`name`,`status`,`date`,`action`,`extraData`,`resellerid`) VALUES ('S','vo',?,?,?,?,?,NULL,NOW(),?,?,?)");
     foreach ($query2->fetchAll(PDO::FETCH_ASSOC) as $row2) {
         $insert->execute(array($row['invoicedByID'], $row2['id'], $row2['masterserver'], $row['affectedID'], $row2['ip'] . ':' . $row2['port'], $row['action'], $row['extraData'], $row2['resellerid']));
     }
+
     $query2 = $sql->prepare("SELECT `dnsID`,`dns`,`ip`,`port`,`tsdnsID`,`resellerID` FROM `voice_dns` WHERE `userID`=?");
     $query2->execute(array($row['affectedID']));
     $insert = $sql->prepare("INSERT INTO `jobs` (`api`,`type`,`invoicedByID`,`affectedID`,`hostID`,`userID`,`name`,`status`,`date`,`action`,`extraData`,`resellerid`) VALUES ('S','ds',?,?,?,?,?,NULL,NOW(),?,?,?)");
     foreach ($query2->fetchAll(PDO::FETCH_ASSOC) as $row2) {
         $insert->execute(array($row['invoicedByID'], $row2['dnsID'], $row2['tsdnsID'], $row['affectedID'], $row2['ip'] . ':' . $row2['port'] . ' ' . $row2['dns'], $row['action'], $row['extraData'], $row2['resellerID']));
     }
+
     $query2 = $sql->prepare("SELECT `id`,`sid`,`dbname`,`resellerid` FROM `mysql_external_dbs` WHERE `uid`=?");
     $query2->execute(array($row['affectedID']));
     $insert = $sql->prepare("INSERT INTO `jobs` (`api`,`type`,`invoicedByID`,`affectedID`,`hostID`,`userID`,`name`,`status`,`date`,`action`,`extraData`,`resellerid`) VALUES ('S','my',?,?,?,?,?,NULL,NOW(),?,?,?)");
     foreach ($query2->fetchAll(PDO::FETCH_ASSOC) as $row2) {
         $insert->execute(array($row['invoicedByID'], $row2['id'], $row2['sid'], $row['affectedID'], $row2['dbname'], $row['action'], $row['extraData'], $row2['resellerid']));
     }
+
     $update = $sql->prepare("UPDATE `jobs` SET `status`='4' WHERE `jobID`=? LIMIT 1");
     $update->execute(array($row['jobID']));
+
     updateJobs($row['affectedID'], $row['resellerID'],$jobPending='Y');
+
     $theOutput->printGraph($command);
 }
\ No newline at end of file
diff --git a/web/stuff/jobs_user_rm.php b/web/stuff/jobs_user_rm.php
index 59cb6ccc..66cec832 100644
--- a/web/stuff/jobs_user_rm.php
+++ b/web/stuff/jobs_user_rm.php
@@ -39,22 +39,26 @@
  */
 
 if (!function_exists('removeUser')) {
-    function removeUser ($userID,$tables,$reseller=null) {
+    function removeUser ($userID, $tables, $reseller = null) {
+
         global $sql;
+
         foreach ($tables as $table => $column) {
-            if ($reseller==null) {
-                $query = $sql->prepare("DELETE FROM `".$table."` WHERE `".$column."`=?");
+            if ($reseller == null) {
+                $query = $sql->prepare("DELETE FROM `" . $table . "` WHERE `" . $column . "`=?");
                 $query->execute(array($userID));
             } else {
-                $query = $sql->prepare("DELETE FROM `".$table."` WHERE `".$column."`=? AND `".$reseller['column']."`=?");
-                $query->execute(array($userID,$reseller['value']));
+                $query = $sql->prepare("DELETE FROM `" . $table . "` WHERE `" . $column . "`=? AND `" . $reseller['column'] . "`=?");
+                $query->execute(array($userID, $reseller['value']));
             }
         }
     }
 }
+
 $query = $sql->prepare("SELECT * FROM `jobs` j WHERE `status`='4' AND `type`='us' AND `action` IN ('dl','md') AND NOT EXISTS (SELECT 1 FROM `jobs` WHERE `userID`=j.`userID` AND (`status`=1 OR `status` IS NULL) AND `type`!='us' LIMIT 1)");
 $query->execute();
 foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
+
     $ok = true;
 
     if ($row['action'] == 'dl') {
@@ -125,17 +129,17 @@ foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) {
         customColumns('U', $row['affectedID'], 'del');
         $query2 = $sql->prepare("DELETE FROM `userdata` WHERE `id`=? LIMIT 1");
         $query2->execute(array($row['affectedID']));
-        $command = $gsprache->del.' userID: '.$row['affectedID'].' name:'.$row['name'];
+        $command = $gsprache->del.' userID: ' . $row['affectedID'] . ' name:' . $row['name'];
 
     } else {
         $extraData = @json_decode($row['extraData']);
         if (is_object($extraData)) {
             $query2 = $sql->prepare("UPDATE `userdata` SET `active`=?,`jobPending`='N' WHERE `id`=? LIMIT 1");
             $query2->execute(array($extraData->newActive, $row['affectedID']));
-            $command = $gsprache->mod.' userID: '.$row['affectedID'].' name:'.$row['name'];
+            $command = $gsprache->mod.' userID: ' . $row['affectedID'] . ' name:' . $row['name'];
         } else {
             $ok = false;
-            $command='Error: '.$gsprache->mod.' userID: '.$row['affectedID'].' name:'.$row['name'];
+            $command='Error: ' . $gsprache->mod . ' userID: ' . $row['affectedID'] . ' name:' . $row['name'];
         }
     }
 
diff --git a/web/stuff/mysql_server.php b/web/stuff/mysql_server.php
index 1f49a2f6..90705027 100644
--- a/web/stuff/mysql_server.php
+++ b/web/stuff/mysql_server.php
@@ -134,7 +134,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
         $pdelete2 = $sql->prepare("DELETE FROM `mysql_external_dbs` WHERE `sid`=? AND `resellerid`=?");
         $pdelete2->execute(array($id,$reseller_id));
         $template_file = $spracheResponse->table_del;
-        $loguseraction="%del% MYSQL Server $ip";
+        $loguseraction="%del% MySQL Server $ip";
         $insertlog->execute();
     } else {
         $id = $ui->id('id', 10, 'get');
@@ -189,7 +189,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
 			$pupdate = $sql->prepare("UPDATE `mysql_external_servers` SET `active`=?,`ip`=?,`port`=?,`user`=?,`password`=AES_ENCRYPT(?,?),`max_databases`=?,`interface`=?,`max_queries_per_hour`=?,`max_updates_per_hour`=?,`max_connections_per_hour`=?,`max_userconnections_per_hour`=? WHERE `id`=? AND `resellerid`=? LIMIT 1");
 			$pupdate->execute(array($active,$ip,$port,$user,$password,$aeskey,$max_databases,$interface,$max_queries_per_hour,$max_updates_per_hour,$max_connections_per_hour,$max_userconnections_per_hour,$id,$reseller_id));
 			$template_file = $spracheResponse->table_add;
-			$loguseraction="%mod% MYSQL Server $ip";
+			$loguseraction="%mod% MySQL Server $ip";
 			$insertlog->execute();
 		}
 	}
@@ -220,7 +220,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
 			$pinsert = $sql->prepare("INSERT INTO `mysql_external_servers` (`active`,`ip`,`port`,`user`,`password`,`max_databases`,`interface`,`max_queries_per_hour`,`max_updates_per_hour`,`max_connections_per_hour`,`max_userconnections_per_hour`,`resellerid`) VALUES (?,?,?,?,AES_ENCRYPT(?,?),?,?,?,?,?,?,?)");
 			$pinsert->execute(array($active,$ip,$port,$user,$password,$aeskey,$max_databases,$interface,$max_queries_per_hour,$max_updates_per_hour,$max_connections_per_hour,$max_userconnections_per_hour,$reseller_id));
 			$template_file = $spracheResponse->table_add;
-			$loguseraction="%add% MYSQL Server $ip";
+			$loguseraction="%add% MySQL Server $ip";
 			$insertlog->execute();
 		}
 	}	
@@ -302,7 +302,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
                 $reply = $remotesql->AddDB($dbname,$password,$ips,$max_queries_per_hour,$max_connections_per_hour,$max_updates_per_hour,$max_userconnections_per_hour);
                 customColumns('D',$id,'save');
                 $template_file = $spracheResponse->table_add;
-                $loguseraction="%add% MYSQL DB $dbname ($ip)";
+                $loguseraction="%add% MySQL DB $dbname ($ip)";
                 $insertlog->execute();
             } else {
                 $template_file = $remotesql->error;
@@ -389,7 +389,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
                     if ($active == 'N' and $old_active == 'Y') $password=passwordgenerate(20);
                     $remotesql->ModDB($dbname,$password,$ips,$max_queries_per_hour,$max_connections_per_hour,$max_updates_per_hour,$max_userconnections_per_hour);
                     $template_file = $spracheResponse->table_add;
-                    $loguseraction="%mod% MYSQL DB $dbname ($ip)";
+                    $loguseraction="%mod% MySQL DB $dbname ($ip)";
                     $insertlog->execute();
                 } else {
                     $template_file = $remotesql->error;
@@ -433,7 +433,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
                 $query->execute(array($id,$reseller_id));
                 customColumns('D',$id,'del');
                 $template_file = $spracheResponse->table_del;
-                $loguseraction="%del% MYSQL DB $dbname ($ip)";
+                $loguseraction="%del% MySQL DB $dbname ($ip)";
                 $insertlog->execute();
             } else {
                 $template_file = $remotesql->error;
diff --git a/web/stuff/root_dedicated.php b/web/stuff/root_dedicated.php
index 03599068..c9a41d4e 100644
--- a/web/stuff/root_dedicated.php
+++ b/web/stuff/root_dedicated.php
@@ -397,7 +397,9 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
             $ip = $row['ip'];
             $bitversion = $row['bitversion'];
         }
-        if (!isset($bitversion)) $bitversion=64;
+        if (!isset($bitversion)) {
+            $bitversion = 64;
+        }
         if (isset($ip)) {
             $extraData = array();
             if ($ui->st('action', 'post') == 'ri') {
diff --git a/web/stuff/userpanel_gserver.php b/web/stuff/userpanel_gserver.php
index 05c88739..7261855c 100644
--- a/web/stuff/userpanel_gserver.php
+++ b/web/stuff/userpanel_gserver.php
@@ -799,7 +799,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) {
                 $maxplayers = 0;
                 $imgName = '16_bad';
                 $imgAlt = 'Stopped';
-            } else if (($name == 'OFFLINE' or $name == '') and $notified>=$rSA['down_checks'] and $stopped == 'N') {
+            } else if (($name == 'OFFLINE' or $name == '') and $stopped == 'N') {
                 $numplayers = 0;
                 $maxplayers = 0;
                 $imgName = '16_error';