diff --git a/admin/bans_editor.php b/admin/bans_editor.php
index e938b8567..ec4a0cf4b 100644
--- a/admin/bans_editor.php
+++ b/admin/bans_editor.php
@@ -313,7 +313,7 @@
         Tki\Db::logDbErrors($pdo_db, $db, $resx, __LINE__, __FILE__);
     }
 
-    $query_string = "ip_address LIKE '" . $bans[0]['ban_mask'] ."'";
+    $query_string = "ip_address LIKE '" . $bans[0]['ban_mask'] . "'";
     for ($i = 1; $i < $nbbans; $i++)
     {
         $query_string = $query_string . " OR ip_address LIKE '" . $bans[$i]['ban_mask'] . "'";
diff --git a/attack.php b/attack.php
index f102cf75b..ba0016f21 100644
--- a/attack.php
+++ b/attack.php
@@ -421,7 +421,7 @@
                 else
                 {
                     $targetarmor = $targetarmor - $playerbeams;
-                    echo $targetinfo['character_name'] . $langvars['l_att_ashit'] ." " . $playerbeams . " " . $langvars['l_att_dmg'] . ".<br>";
+                    echo $targetinfo['character_name'] . $langvars['l_att_ashit'] . " " . $playerbeams . " " . $langvars['l_att_dmg'] . ".<br>";
                 }
             }
 
@@ -549,7 +549,7 @@
 
                 if ($targetfighters > $playerfighters)
                 {
-                    echo $langvars['l_att_ylostf'] ."<br>";
+                    echo $langvars['l_att_ylostf'] . "<br>";
                     $tempplayfighters = 0;
                 }
                 else
@@ -572,7 +572,7 @@
                 else
                 {
                     $targetarmor = $targetarmor - $playerfighters;
-                    echo $targetinfo['character_name'] . " " . $langvars['l_att_ashit'] ." " . $playerfighters . " " . $langvars['l_att_dmg'] . ".<br>";
+                    echo $targetinfo['character_name'] . " " . $langvars['l_att_ashit'] . " " . $playerfighters . " " . $langvars['l_att_dmg'] . ".<br>";
                 }
             }
 
diff --git a/bounty.php b/bounty.php
index 788c6568c..d6847ba5b 100644
--- a/bounty.php
+++ b/bounty.php
@@ -332,7 +332,7 @@
                 Tki\Db::logDbErrors($pdo_db, $db, $someres, __LINE__, __FILE__);
                 $details = $someres->fields;
                 echo "<tr bgcolor=\"$color\">";
-                echo "<td><a href=bounty.php?bounty_on=" . $bounties[$i]['bounty_on'] . "&response=display>". $details['character_name'] ."</a></td>";
+                echo "<td><a href=bounty.php?bounty_on=" . $bounties[$i]['bounty_on'] . "&response=display>". $details['character_name'] . "</a></td>";
                 echo "<td>" . $bounties[$i]['total_bounty'] . "</td>";
                 echo "</tr>";
 
diff --git a/classes/Db.php b/classes/Db.php
index b2a75d23f..f78963f0c 100644
--- a/classes/Db.php
+++ b/classes/Db.php
@@ -138,7 +138,7 @@ public function initDb($db_layer)
             {
                 $err_msg = 'The Kabal Invasion - General error: Unable to connect to the ' . $db_type .
                             ' Database.<br> Database Error: '.
-                            $e->getMessage() ."<br>\n";
+                            $e->getMessage() . "<br>\n";
                 die ($err_msg);
             }
 
diff --git a/classes/Ibank.php b/classes/Ibank.php
index 66f4c71fc..7f5bbbc9c 100644
--- a/classes/Ibank.php
+++ b/classes/Ibank.php
@@ -69,7 +69,7 @@ public static function ibankBorrow(\PDO $pdo_db, $lang, $langvars, \Tki\Reg $tki
              "<tr valign=top>" .
              "<td>" . $langvars['l_ibank_amountowned'] . " :</td><td nowrap align=right>" . number_format($amount3, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " C<br>" .
              "<tr valign=top>" .
-             "<td colspan=2 align=center>---------------------------------<br><br>" . $langvars['l_ibank_loanreminder'] . "<br><br>\"" . $langvars['l_ibank_loanreminder2'] ."\"</td>" .
+             "<td colspan=2 align=center>---------------------------------<br><br>" . $langvars['l_ibank_loanreminder'] . "<br><br>\"" . $langvars['l_ibank_loanreminder2'] . "\"</td>" .
              "<tr valign=top>" .
              "<td nowrap><a href='ibank.php?command=login'>" . $langvars['l_ibank_back'] . "</a></td><td nowrap align=right>&nbsp;<a href=\"main.php\">" . $langvars['l_ibank_logout'] . "</a></td>" .
              "</tr>";
@@ -105,7 +105,7 @@ public static function ibankWithdraw($langvars, $account)
         echo "<tr><td colspan=2 align=center valign=top>" . $langvars['l_ibank_withdrawfunds'] . "<br>---------------------------------</td></tr>" .
              "<tr valign=top>" .
              "<td>" . $langvars['l_ibank_fundsavailable'] . ":</td>" .
-             "<td align=right>" . number_format($account['balance'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) ." C<br></td>" .
+             "<td align=right>" . number_format($account['balance'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " C<br></td>" .
              "</tr><tr valign=top>" .
              "<td>" . $langvars['l_ibank_selwithdrawamount'] . ":</td><td align=right>" .
              "<form accept-charset='utf-8' action='ibank.php?command=withdraw2' method=post>" .
@@ -140,7 +140,7 @@ public static function ibankWithdraw2(\PDO $pdo_db, $lang, $langvars, $playerinf
 
         echo "<tr><td colspan=2 align=center valign=top>" . $langvars['l_ibank_operationsuccessful'] . "<br>---------------------------------</td></tr>" .
              "<tr valign=top>" .
-             "<td colspan=2 align=center>" . number_format($amount, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) ." " . $langvars['l_ibank_creditstoyourship'] . "</td>" .
+             "<td colspan=2 align=center>" . number_format($amount, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_ibank_creditstoyourship'] . "</td>" .
              "<tr><td colspan=2 align=center>" . $langvars['l_ibank_accounts'] . "<br>---------------------------------</td></tr>" .
              "<tr valign=top>" .
              "<td>Ship Account :<br>" . $langvars['l_ibank_ibankaccount'] . " :</td>" .
@@ -799,7 +799,7 @@ public static function ibankDeposit2(\PDO $pdo_db, $lang, $langvars, $playerinfo
 
         echo "<tr><td colspan=2 align=center valign=top>" . $langvars['l_ibank_operationsuccessful'] . "<br>---------------------------------</td></tr>" .
              "<tr valign=top>" .
-             "<td colspan=2 align=center>" . number_format($amount, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) ." " . $langvars['l_ibank_creditstoyou'] . "</td>" .
+             "<td colspan=2 align=center>" . number_format($amount, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_ibank_creditstoyou'] . "</td>" .
              "<tr><td colspan=2 align=center>" . $langvars['l_ibank_accounts'] . "<br>---------------------------------</td></tr>" .
              "<tr valign=top>" .
              "<td>" . $langvars['l_ibank_shipaccount'] . " :<br>" . $langvars['l_ibank_ibankaccount'] . " :</td>" .
@@ -957,7 +957,7 @@ public static function ibankDeposit(\PDO $pdo_db, $lang, $account, $playerinfo)
         echo "<tr><td height=53 colspan=2 align=center valign=top>" . $langvars['l_ibank_depositfunds'] . "<br>---------------------------------</td></tr>" .
              "<tr valign=top>" .
              "<td height=30>" . $langvars['l_ibank_fundsavailable'] . " :</td>" .
-             "<td align=right>" . number_format($playerinfo['credits'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) ." C<br></td>" .
+             "<td align=right>" . number_format($playerinfo['credits'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " C<br></td>" .
              "</tr><tr valign=top>" .
              "<td height=90>" . $langvars['l_ibank_seldepositamount'] . " :</td><td align=right>" .
              "<form accept-charset='utf-8' action='ibank.php?command=deposit2' method=post>" .
@@ -967,7 +967,7 @@ public static function ibankDeposit(\PDO $pdo_db, $lang, $account, $playerinfo)
              "</td></tr>" .
              "<tr>" .
              "  <td height=30  colspan=2 align=left>" .
-             "    <span style='color:\"#00ff00\";'>You can deposit only ". number_format($credit_space, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." credits.</span><br>" .
+             "    <span style='color:\"#00ff00\";'>You can deposit only ". number_format($credit_space, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " credits.</span><br>" .
              "  </td>" .
              "</tr>" .
              "<tr valign=bottom>" .
diff --git a/classes/Planet.php b/classes/Planet.php
index b94cf96b3..1c9f8c89b 100644
--- a/classes/Planet.php
+++ b/classes/Planet.php
@@ -582,7 +582,7 @@ public static function planetCombat($pdo_db, $db, $lang, $langvars, \Tki\Reg $tk
                 }
                 else
                 {
-                    $langvars['l_cmb_youmaycapture'] = str_replace("[capture]", "<a href='planet.php?planet_id=". $planetinfo['planet_id'] ."&amp;command=capture'>" . $langvars['l_planet_capture1'] . "</a>", $langvars['l_cmb_youmaycapture']);
+                    $langvars['l_cmb_youmaycapture'] = str_replace("[capture]", "<a href='planet.php?planet_id=". $planetinfo['planet_id'] . "&amp;command=capture'>" . $langvars['l_planet_capture1'] . "</a>", $langvars['l_cmb_youmaycapture']);
                     echo "<center><font color=red>" . $langvars['l_cmb_youmaycapture'] . "</font></center><br><br>";
                     \Tki\PlayerLog::writeLog($pdo_db, $db, $ownerinfo['ship_id'], LOG_PLANET_DEFEATED, "$planetinfo[name]|$playerinfo[sector]|$playerinfo[character_name]");
                     \Tki\Score::updateScore($pdo_db, $ownerinfo['ship_id'], $tkireg, $playerinfo);
@@ -592,7 +592,7 @@ public static function planetCombat($pdo_db, $db, $lang, $langvars, \Tki\Reg $tk
             }
             else
             {
-                $langvars['l_cmb_youmaycapture'] = str_replace("[capture]", "<a href='planet.php?planet_id=". $planetinfo['planet_id'] ."&amp;command=capture'>" . $langvars['l_planet_capture1'] . "</a>", $langvars['l_cmb_youmaycapture']);
+                $langvars['l_cmb_youmaycapture'] = str_replace("[capture]", "<a href='planet.php?planet_id=". $planetinfo['planet_id'] . "&amp;command=capture'>" . $langvars['l_planet_capture1'] . "</a>", $langvars['l_cmb_youmaycapture']);
                 echo "<center>" . $langvars['l_cmb_youmaycapture'] . "</center><br><br>";
                 \Tki\PlayerLog::writeLog($pdo_db, $db, $ownerinfo['ship_id'], LOG_PLANET_DEFEATED, "$planetinfo[name]|$playerinfo[sector]|$playerinfo[character_name]");
                 \Tki\Score::updateScore($pdo_db, $ownerinfo['ship_id'], $tkireg, $playerinfo);
diff --git a/classes/PlanetReport.php b/classes/PlanetReport.php
index 24e869ca1..cbf025afa 100644
--- a/classes/PlanetReport.php
+++ b/classes/PlanetReport.php
@@ -115,7 +115,7 @@ public static function standardReport($pdo_db, $db, $langvars, $playerinfo, $sor
             echo "<td><strong><a href=\"planet_report.php?preptype=1&amp;sort=sector_id\">" . $langvars['l_sector'] . "</a></strong></td>";
             echo "<td><strong><a href=\"planet_report.php?preptype=1&amp;sort=name\">" . $langvars['l_name'] . "</a></strong></td>";
             echo "<td><strong><a href=\"planet_report.php?preptype=1&amp;sort=ore\">" . $langvars['l_ore'] . "</a></strong></td>";
-            echo "<td><strong><a href=\"planet_report.php?preptype=1&amp;sort=organics\">" . $langvars['l_organics'] ."</a></strong></td>";
+            echo "<td><strong><a href=\"planet_report.php?preptype=1&amp;sort=organics\">" . $langvars['l_organics'] . "</a></strong></td>";
             echo "<td><strong><a href=\"planet_report.php?preptype=1&amp;sort=goods\">" . $langvars['l_goods'] . "</a></strong></td>";
             echo "<td><strong><a href=\"planet_report.php?preptype=1&amp;sort=energy\">" . $langvars['l_energy'] . "</a></strong></td>";
             echo "<td align=center><strong><a href=\"planet_report.php?preptype=1&amp;sort=colonists\">" . $langvars['l_colonists'] . "</a></strong></td>";
@@ -172,7 +172,7 @@ public static function standardReport($pdo_db, $db, $langvars, $playerinfo, $sor
                 }
 
                 echo "<tr bgcolor=\"$color\">";
-                echo "<td><a href=rsmove.php?engage=1&destination=". $planet[$i]['sector_id'] . ">". $planet[$i]['sector_id'] ."</a></td>";
+                echo "<td><a href=rsmove.php?engage=1&destination=". $planet[$i]['sector_id'] . ">". $planet[$i]['sector_id'] . "</a></td>";
                 echo "<td>" . $planet[$i]['name'] . "</td>";
                 echo "<td>" . number_format($planet[$i]['ore'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . "</td>";
                 echo "<td>" . number_format($planet[$i]['organics'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . "</td>";
@@ -333,7 +333,7 @@ public static function planetProductionChange($pdo_db, $db, $langvars, $playerin
                 }
 
                 echo "<tr bgcolor=\"$color\">\n";
-                echo "<td><a href=rsmove.php?engage=1&amp;destination=". $planet[$i]['sector_id'] . ">". $planet[$i]['sector_id'] ."</a></td>\n";
+                echo "<td><a href=rsmove.php?engage=1&amp;destination=". $planet[$i]['sector_id'] . ">". $planet[$i]['sector_id'] . "</a></td>\n";
                 echo "<td>" . $planet[$i]['name'] . "</td>\n";
                 echo "<td align=center>" . "<input size=6 type=text name=\"prod_ore["      . $planet[$i]['planet_id'] . "]\" value=\"" . $planet[$i]['prod_ore']      . "\">" . "</td>\n";
                 echo "<td align=center>" . "<input size=6 type=text name=\"prod_organics[" . $planet[$i]['planet_id'] . "]\" value=\"" . $planet[$i]['prod_organics'] . "\">" . "</td>\n";
diff --git a/classes/Traderoute.php b/classes/Traderoute.php
index 37c4fbcb4..c9212d587 100644
--- a/classes/Traderoute.php
+++ b/classes/Traderoute.php
@@ -343,22 +343,22 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
         // Determine if Source is Planet or Port
         if ($traderoute['source_type'] == 'P')
         {
-            echo $langvars['l_tdr_portin']." ".$source['sector_id'];
+            echo $langvars['l_tdr_portin'] . " " . $source['sector_id'];
         }
         elseif (($traderoute['source_type'] == 'L') || ($traderoute['source_type'] == 'C'))
         {
-            echo $langvars['l_tdr_planet']." ".$source['name']." in ".$sourceport['sector_id'];
+            echo $langvars['l_tdr_planet'] . " " . $source['name'] . " in " . $sourceport['sector_id'];
         }
         self::traderouteResultsSource();
 
         // Determine if Destination is Planet or Port
         if ($traderoute['dest_type'] == 'P')
         {
-            echo $langvars['l_tdr_portin']." ".$dest['sector_id'];
+            echo $langvars['l_tdr_portin'] . " " . $dest['sector_id'];
         }
         elseif (($traderoute['dest_type'] == 'L') || ($traderoute['dest_type'] == 'C'))
         {
-            echo $langvars['l_tdr_planet']." ".$dest['name']." in ".$destport['sector_id'];
+            echo $langvars['l_tdr_planet'] . " " . $dest['name'] . " in " . $destport['sector_id'];
         }
         self::traderouteResultsDestination($tkireg);
 
@@ -384,7 +384,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                     if ($colonists_buy != 0)
                     {
-                        echo $langvars['l_tdr_bought']." ".number_format($colonists_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_colonists']."<br>";
+                        echo $langvars['l_tdr_bought'] . " " . number_format($colonists_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_colonists'] . "<br>";
                     }
 
                     $sourcecost -= $colonists_buy * $tkireg->colonist_price;
@@ -407,7 +407,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                     if ($fighters_buy != 0)
                     {
-                        echo $langvars['l_tdr_bought']." ".number_format($fighters_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_fighters']."<br>";
+                        echo $langvars['l_tdr_bought'] . " " . number_format($fighters_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_fighters'] . "<br>";
                     }
 
                     $sourcecost -= $fighters_buy * $tkireg->fighter_price;
@@ -430,7 +430,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                     if ($torps_buy != 0)
                     {
-                        echo $langvars['l_tdr_bought']." ".number_format($torps_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_torps']."<br>";
+                        echo $langvars['l_tdr_bought'] . " " . number_format($torps_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_torps'] . "<br>";
                     }
 
                     $sourcecost -= $torps_buy * $tkireg->torpedo_price;
@@ -442,7 +442,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                 if ($torps_buy == 0 && $colonists_buy == 0 && $fighters_buy == 0)
                 {
-                    echo $langvars['l_tdr_nothingtotrade']."<br>";
+                    echo $langvars['l_tdr_nothingtotrade'] . "<br>";
                 }
 
                 if ($traderoute['circuit'] == '1')
@@ -479,11 +479,11 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                     {
                         if ($portfull == 1)
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_ore']." (".$langvars['l_tdr_portisfull'].")<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_ore'] . " (" . $langvars['l_tdr_portisfull'] . ")<br>";
                         }
                         else
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_ore']."<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_ore'] . "<br>";
                         }
                     }
                     $playerinfo['ship_ore'] -= $ore_buy;
@@ -508,11 +508,11 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                     {
                         if ($portfull == 1)
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_goods']." (".$langvars['l_tdr_portisfull'].")<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_goods'] . " (" . $langvars['l_tdr_portisfull'] . ")<br>";
                         }
                         else
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_goods']."<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_goods'] . "<br>";
                         }
                     }
                     $playerinfo['ship_goods'] -= $goods_buy;
@@ -537,11 +537,11 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                     {
                         if ($portfull == 1)
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_organics']." (".$langvars['l_tdr_portisfull'].")<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_organics'] . " (" . $langvars['l_tdr_portisfull'] . ")<br>";
                         }
                         else
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_organics']."<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_organics'] . "<br>";
                         }
                     }
                     $playerinfo['ship_organics'] -= $organics_buy;
@@ -565,11 +565,11 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                     {
                         if ($portfull == 1)
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_energy']." (".$langvars['l_tdr_portisfull'].")<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_energy'] . " (" . $langvars['l_tdr_portisfull'] . ")<br>";
                         }
                         else
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_energy']."<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_energy'] . "<br>";
                         }
                     }
                     $playerinfo['ship_energy'] -= $energy_buy;
@@ -592,13 +592,13 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                         $ore_buy = $source['port_ore'];
                         if ($source['port_ore'] == 0)
                         {
-                            echo $langvars['l_tdr_bought']." ".number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_ore']."(".$langvars['l_tdr_portisempty'].")<br>";
+                            echo $langvars['l_tdr_bought'] . " " . number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_ore'] . "(" . $langvars['l_tdr_portisempty'] . ")<br>";
                         }
                     }
 
                     if ($ore_buy != 0)
                     {
-                        echo $langvars['l_tdr_bought']." ".number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_ore']."<br>";
+                        echo $langvars['l_tdr_bought'] . " " . number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_ore'] . "<br>";
                     }
                     $playerinfo['ship_ore'] += $ore_buy;
                     $sourcecost -= $ore_buy * $tkireg->ore_price1;
@@ -620,13 +620,13 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                         $goods_buy = $source['port_goods'];
                         if ($source['port_goods'] == 0)
                         {
-                            echo $langvars['l_tdr_bought']." ".number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_goods']." (".$langvars['l_tdr_portisempty'].")<br>";
+                            echo $langvars['l_tdr_bought'] . " " . number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_goods'] . " (" . $langvars['l_tdr_portisempty'] . ")<br>";
                         }
                     }
 
                     if ($goods_buy != 0)
                     {
-                        echo $langvars['l_tdr_bought']." ".number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_goods']."<br>";
+                        echo $langvars['l_tdr_bought'] . " " . number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_goods'] . "<br>";
                     }
 
                     $playerinfo['ship_goods'] += $goods_buy;
@@ -651,13 +651,13 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                         $organics_buy = $source['port_organics'];
                         if ($source['port_organics'] == 0)
                         {
-                            echo $langvars['l_tdr_bought']." ".number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_organics']." (".$langvars['l_tdr_portisempty'].")<br>";
+                            echo $langvars['l_tdr_bought'] . " " . number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_organics'] . " (" . $langvars['l_tdr_portisempty'] . ")<br>";
                         }
                     }
 
                     if ($organics_buy != 0)
                     {
-                        echo $langvars['l_tdr_bought']." ".number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_organics']."<br>";
+                        echo $langvars['l_tdr_bought'] . " " . number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_organics'] . "<br>";
                     }
 
                     $playerinfo['ship_organics'] += $organics_buy;
@@ -681,13 +681,13 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                         $energy_buy = $source['port_energy'];
                         if ($source['port_energy'] == 0)
                         {
-                            echo $langvars['l_tdr_bought']." ".number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_energy']." (".$langvars['l_tdr_portisempty'].")<br>";
+                            echo $langvars['l_tdr_bought'] . " " . number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_energy'] . " (" . $langvars['l_tdr_portisempty'] . ")<br>";
                         }
                     }
 
                     if ($energy_buy != 0)
                     {
-                        echo $langvars['l_tdr_bought']." ".number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_energy']."<br>";
+                        echo $langvars['l_tdr_bought'] . " " . number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_energy'] . "<br>";
                     }
                     $playerinfo['ship_energy'] += $energy_buy;
                     $sourcecost -= $energy_buy * $tkireg->energy_price1;
@@ -706,7 +706,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                 if ($ore_buy == 0 && $goods_buy == 0 && $energy_buy == 0 && $organics_buy == 0)
                 {
-                    echo $langvars['l_tdr_nothingtotrade']."<br>";
+                    echo $langvars['l_tdr_nothingtotrade'] . "<br>";
                 }
 
                 if ($traderoute['circuit'] == '1')
@@ -738,7 +738,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                         $free_holds -= $goods_buy;
                         $playerinfo['ship_goods'] += $goods_buy;
-                        echo $langvars['l_tdr_loaded']." ".number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_goods']."<br>";
+                        echo $langvars['l_tdr_loaded'] . " " . number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_goods'] . "<br>";
                     }
                     else
                     {
@@ -758,7 +758,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                         $free_holds -= $ore_buy;
                         $playerinfo['ship_ore'] += $ore_buy;
-                        echo $langvars['l_tdr_loaded']." ".number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_ore']."<br>";
+                        echo $langvars['l_tdr_loaded'] . " " . number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_ore'] . "<br>";
                     }
                     else
                     {
@@ -778,7 +778,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                         $free_holds -= $organics_buy;
                         $playerinfo['ship_organics'] += $organics_buy;
-                        echo $langvars['l_tdr_loaded']." ".number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_organics']."<br>";
+                        echo $langvars['l_tdr_loaded'] . " " . number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_organics'] . "<br>";
                     }
                     else
                     {
@@ -787,7 +787,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                     if ($ore_buy == 0 && $goods_buy == 0 && $organics_buy == 0)
                     {
-                        echo $langvars['l_tdr_nothingtoload']."<br>";
+                        echo $langvars['l_tdr_nothingtoload'] . "<br>";
                     }
 
                     if ($traderoute['circuit'] == '1')
@@ -816,7 +816,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                     $free_holds -= $colonists_buy;
                     $playerinfo['ship_colonists'] += $colonists_buy;
-                    echo $langvars['l_tdr_loaded']." ".number_format($colonists_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_colonists']."<br>";
+                    echo $langvars['l_tdr_loaded'] . " " . number_format($colonists_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_colonists'] . "<br>";
                 }
                 else
                 {
@@ -837,7 +837,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                     $free_torps -= $torps_buy;
                     $playerinfo['torps'] += $torps_buy;
-                    echo $langvars['l_tdr_loaded']." ".number_format($torps_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_torps']."<br>";
+                    echo $langvars['l_tdr_loaded'] . " " . number_format($torps_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_torps'] . "<br>";
                 }
                 else
                 {
@@ -858,7 +858,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                     $free_fighters -= $fighters_buy;
                     $playerinfo['ship_fighters'] += $fighters_buy;
-                    echo $langvars['l_tdr_loaded']." ".number_format($fighters_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_fighters']."<br>";
+                    echo $langvars['l_tdr_loaded'] . " " . number_format($fighters_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_fighters'] . "<br>";
                 }
                 else
                 {
@@ -867,7 +867,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                 if ($fighters_buy == 0 && $torps_buy == 0 && $colonists_buy == 0)
                 {
-                    echo $langvars['l_tdr_nothingtoload']."<br>";
+                    echo $langvars['l_tdr_nothingtoload'] . "<br>";
                 }
 
                 if ($traderoute['circuit'] == '1')
@@ -883,7 +883,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
         if ($dist['scooped1'] != 0)
         {
-            echo $langvars['l_tdr_scooped']." ".number_format($dist['scooped1'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_energy']."<br>";
+            echo $langvars['l_tdr_scooped'] . " " . number_format($dist['scooped1'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_energy'] . "<br>";
         }
 
         self::traderouteResultsCloseCell();
@@ -921,11 +921,11 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                     {
                         if ($portfull == 1)
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_ore']." (".$langvars['l_tdr_portisfull'].")<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_ore'] . " (" . $langvars['l_tdr_portisfull'] . ")<br>";
                         }
                         else
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_ore']."<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_ore'] . "<br>";
                         }
                     }
                     $playerinfo['ship_ore'] -= $ore_buy;
@@ -950,11 +950,11 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                     {
                         if ($portfull == 1)
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_goods']." (".$langvars['l_tdr_portisfull'].")<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_goods'] . " (" . $langvars['l_tdr_portisfull'] . ")<br>";
                         }
                         else
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_goods']."<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_goods'] . "<br>";
                         }
                     }
                     $playerinfo['ship_goods'] -= $goods_buy;
@@ -979,11 +979,11 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                     {
                         if ($portfull == 1)
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_organics']." (".$langvars['l_tdr_portisfull'].")<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_organics'] . " (" . $langvars['l_tdr_portisfull'] . ")<br>";
                         }
                         else
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_organics']."<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_organics'] . "<br>";
                         }
                     }
                     $playerinfo['ship_organics'] -= $organics_buy;
@@ -1008,11 +1008,11 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                     {
                         if ($portfull == 1)
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_energy']." (".$langvars['l_tdr_portisfull'].")<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_energy'] . " (" . $langvars['l_tdr_portisfull'] . ")<br>";
                         }
                         else
                         {
-                            echo $langvars['l_tdr_sold']." ".number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_energy']."<br>";
+                            echo $langvars['l_tdr_sold'] . " " . number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_energy'] . "<br>";
                         }
                     }
                     $playerinfo['ship_energy'] -= $energy_buy;
@@ -1045,13 +1045,13 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                             $ore_buy = $dest['port_ore'];
                             if ($dest['port_ore'] == 0)
                             {
-                                echo $langvars['l_tdr_bought']." ".number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_ore']." (".$langvars['l_tdr_portisempty'].")<br>";
+                                echo $langvars['l_tdr_bought'] . " " . number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_ore'] . " (" . $langvars['l_tdr_portisempty'] . ")<br>";
                             }
                         }
 
                         if ($ore_buy != 0)
                         {
-                            echo $langvars['l_tdr_bought']." ".number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_ore']."<br>";
+                            echo $langvars['l_tdr_bought'] . " " . number_format($ore_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_ore'] . "<br>";
                         }
 
                         $playerinfo['ship_ore'] += $ore_buy;
@@ -1081,13 +1081,13 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                             $goods_buy = $dest['port_goods'];
                             if ($dest['port_goods'] == 0)
                             {
-                                echo $langvars['l_tdr_bought']." ".number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_goods']." (".$langvars['l_tdr_portisempty'].")<br>";
+                                echo $langvars['l_tdr_bought'] . " " . number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_goods'] . " (" . $langvars['l_tdr_portisempty'] . ")<br>";
                             }
                         }
 
                         if ($goods_buy != 0)
                         {
-                            echo $langvars['l_tdr_bought']." ".number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_goods']."<br>";
+                            echo $langvars['l_tdr_bought'] . " " . number_format($goods_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_goods'] . "<br>";
                         }
 
                         $playerinfo['ship_goods'] += $goods_buy;
@@ -1117,13 +1117,13 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                             if ($dest['port_organics'] == 0)
                             {
-                                echo $langvars['l_tdr_bought']." ".number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_organics']." (".$langvars['l_tdr_portisempty'].")<br>";
+                                echo $langvars['l_tdr_bought'] . " " . number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_organics'] . " (" . $langvars['l_tdr_portisempty'] . ")<br>";
                             }
                         }
 
                         if ($organics_buy != 0)
                         {
-                            echo $langvars['l_tdr_bought']." ".number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_organics']."<br>";
+                            echo $langvars['l_tdr_bought'] . " " . number_format($organics_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_organics'] . "<br>";
                         }
 
                         $playerinfo['ship_organics'] += $organics_buy;
@@ -1153,13 +1153,13 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                             $energy_buy = $dest['port_energy'];
                             if ($dest['port_energy'] == 0)
                             {
-                                echo $langvars['l_tdr_bought']." ".number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_energy']." (".$langvars['l_tdr_portisempty'].")<br>";
+                                echo $langvars['l_tdr_bought'] . " ".number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " ".$langvars['l_tdr_energy'] . " (".$langvars['l_tdr_portisempty'] . ")<br>";
                             }
                         }
 
                         if ($energy_buy != 0)
                         {
-                            echo $langvars['l_tdr_bought']." ".number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_energy']."<br>";
+                            echo $langvars['l_tdr_bought'] . " " . number_format($energy_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_energy'] . "<br>";
                         }
 
                         $playerinfo['ship_energy'] += $energy_buy;
@@ -1168,7 +1168,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                     if ($ore_buy == 0 && $goods_buy == 0 && $energy_buy == 0 && $organics_buy == 0)
                     {
-                        echo $langvars['l_tdr_nothingtotrade']."<br>";
+                        echo $langvars['l_tdr_nothingtotrade'] . "<br>";
                     }
 
                     $resn = $db->Execute("UPDATE {$db->prefix}universe SET port_ore=port_ore-?, port_energy=port_energy-?, port_goods=port_goods-?, port_organics=port_organics-? WHERE sector_id=?", array($ore_buy, $energy_buy, $goods_buy, $organics_buy, $dest['sector_id']));
@@ -1223,11 +1223,11 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
                 {
                     if ($setcol == 1)
                     {
-                        echo $langvars['l_tdr_dumped']." ".number_format($colonists_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_colonists']." (".$langvars['l_tdr_planetisovercrowded'].")<br>";
+                        echo $langvars['l_tdr_dumped'] . " " . number_format($colonists_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_colonists'] . " (" . $langvars['l_tdr_planetisovercrowded'] . ")<br>";
                     }
                     else
                     {
-                        echo $langvars['l_tdr_dumped']." ".number_format($colonists_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_colonists']."<br>";
+                        echo $langvars['l_tdr_dumped'] . " " . number_format($colonists_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_colonists'] . "<br>";
                     }
                 }
 
@@ -1243,7 +1243,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                 if ($fighters_buy != 0)
                 {
-                    echo $langvars['l_tdr_dumped']." ".number_format($fighters_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_fighters']."<br>";
+                    echo $langvars['l_tdr_dumped'] . " " . number_format($fighters_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_fighters'] . "<br>";
                 }
 
                 if ($playerinfo['trade_torps'] == 'Y')
@@ -1258,12 +1258,12 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
                 if ($torps_buy != 0)
                 {
-                    echo $langvars['l_tdr_dumped']." ".number_format($torps_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_torps']."<br>";
+                    echo $langvars['l_tdr_dumped'] . " " . number_format($torps_buy, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_torps'] . "<br>";
                 }
 
                 if ($torps_buy == 0 && $fighters_buy == 0 && $colonists_buy == 0)
                 {
-                    echo $langvars['l_tdr_nothingtodump']."<br>";
+                    echo $langvars['l_tdr_nothingtodump'] . "<br>";
                 }
 
                 if ($traderoute['source_type'] == 'L' || $traderoute['source_type'] == 'C')
@@ -1323,7 +1323,7 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
             }
             if ($dist['scooped2'] != 0)
             {
-                echo $langvars['l_tdr_scooped']." ".number_format($dist['scooped1'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." ".$langvars['l_tdr_energy']."<br>";
+                echo $langvars['l_tdr_scooped'] . " " . number_format($dist['scooped1'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_tdr_energy'] . "<br>";
             }
         }
         else
@@ -1335,21 +1335,21 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
         if ($sourcecost > 0)
         {
-            echo $langvars['l_tdr_profit']." : ".number_format(abs($sourcecost), 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']);
+            echo $langvars['l_tdr_profit'] . " : " . number_format(abs($sourcecost), 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']);
         }
         else
         {
-            echo $langvars['l_tdr_cost']." : ".number_format(abs($sourcecost), 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']);
+            echo $langvars['l_tdr_cost'] . " : " . number_format(abs($sourcecost), 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']);
         }
         self::traderouteResultsCloseCost();
 
         if ($destcost > 0)
         {
-            echo $langvars['l_tdr_profit']." : ".number_format(abs($destcost), 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']);
+            echo $langvars['l_tdr_profit'] . " : " . number_format(abs($destcost), 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']);
         }
         else
         {
-            echo $langvars['l_tdr_cost']." : ".number_format(abs($destcost), 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']);
+            echo $langvars['l_tdr_cost'] . " : " . number_format(abs($destcost), 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']);
         }
 
         self::traderouteResultsCloseTable();
@@ -1372,17 +1372,17 @@ public static function traderouteEngage($db, $pdo_db, $lang, $j, $langvars, \Tki
 
         $tdr_display_creds = number_format($playerinfo['credits'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']);
         self::traderouteResultsDisplaySummary($pdo_db, $lang, $tdr_display_creds, $dist, $playerinfo);
-        // echo $j." -- ";
+        // echo $j . " -- ";
         if ($traderoute['circuit'] == 2)
         {
-            $langvars['l_tdr_engageagain'] = str_replace("[here]", "<a href=\"traderoute.php?engage=[tdr_engage]\">".$langvars['l_here']."</a>", $langvars['l_tdr_engageagain']);
-            $langvars['l_tdr_engageagain'] = str_replace("[five]", "<a href=\"traderoute.php?engage=[tdr_engage]&amp;tr_repeat=5\">".$langvars['l_tdr_five']."</a>", $langvars['l_tdr_engageagain']);
-            $langvars['l_tdr_engageagain'] = str_replace("[ten]", "<a href=\"traderoute.php?engage=[tdr_engage]&amp;tr_repeat=10\">".$langvars['l_tdr_ten']."</a>", $langvars['l_tdr_engageagain']);
-            $langvars['l_tdr_engageagain'] = str_replace("[fifty]", "<a href=\"traderoute.php?engage=[tdr_engage]&amp;tr_repeat=50\">".$langvars['l_tdr_fifty']."</a>", $langvars['l_tdr_engageagain']);
+            $langvars['l_tdr_engageagain'] = str_replace("[here]", "<a href=\"traderoute.php?engage=[tdr_engage]\">".$langvars['l_here'] . "</a>", $langvars['l_tdr_engageagain']);
+            $langvars['l_tdr_engageagain'] = str_replace("[five]", "<a href=\"traderoute.php?engage=[tdr_engage]&amp;tr_repeat=5\">".$langvars['l_tdr_five'] . "</a>", $langvars['l_tdr_engageagain']);
+            $langvars['l_tdr_engageagain'] = str_replace("[ten]", "<a href=\"traderoute.php?engage=[tdr_engage]&amp;tr_repeat=10\">".$langvars['l_tdr_ten'] . "</a>", $langvars['l_tdr_engageagain']);
+            $langvars['l_tdr_engageagain'] = str_replace("[fifty]", "<a href=\"traderoute.php?engage=[tdr_engage]&amp;tr_repeat=50\">".$langvars['l_tdr_fifty'] . "</a>", $langvars['l_tdr_engageagain']);
             $langvars['l_tdr_engageagain'] = str_replace("[tdr_engage]", $engage, $langvars['l_tdr_engageagain']);
             if ($j == 1)
             {
-                echo $langvars['l_tdr_engageagain']."\n";
+                echo $langvars['l_tdr_engageagain'] . "\n";
                 self::traderouteResultsShowRepeat($engage);
             }
         }
@@ -1428,10 +1428,10 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
         }
         else
         {
-            echo $langvars['l_tdr_editinga']." ";
+            echo $langvars['l_tdr_editinga'] . " ";
         }
 
-        echo $langvars['l_tdr_traderoute']."</strong></font><p>";
+        echo $langvars['l_tdr_traderoute'] . "</strong></font><p>";
 
         // Get Planet info Team and Personal
 
@@ -1474,15 +1474,15 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
         }
 
         // Display Current Sector
-        echo $langvars['l_tdr_cursector']." ".$playerinfo['sector']."<br>";
+        echo $langvars['l_tdr_cursector'] . " " . $playerinfo['sector'] . "<br>";
 
         // Start of form for starting location
         echo "
             <form accept-charset='utf-8' action=traderoute.php?command=create method=post>
             <table border=0><tr>
-            <td align=right><font size=2><strong>" . $langvars['l_tdr_selspoint']." <br>&nbsp;</strong></font></td>
+            <td align=right><font size=2><strong>" . $langvars['l_tdr_selspoint'] . " <br>&nbsp;</strong></font></td>
             <tr>
-            <td align=right><font size=2>" . $langvars['l_tdr_port']." : </font></td>
+            <td align=right><font size=2>" . $langvars['l_tdr_port'] . " : </font></td>
             <td><input type=radio name=\"ptype1\" value=\"port\"
             ";
 
@@ -1508,7 +1508,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
 
         // Personal Planet
         echo "
-            <td align=right><font size=2>Personal " . $langvars['l_tdr_planet']." : </font></td>
+            <td align=right><font size=2>Personal " . $langvars['l_tdr_planet'] . " : </font></td>
             <td><input type=radio name=\"ptype1\" value=\"planet\"
             ";
 
@@ -1524,7 +1524,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
 
         if ($num_planets == 0)
         {
-            echo "<option value=none>".$langvars['l_tdr_none']."</option>";
+            echo "<option value=none>".$langvars['l_tdr_none'] . "</option>";
         }
         else
         {
@@ -1538,7 +1538,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
                     echo "selected ";
                 }
 
-                echo "value=".$planets[$i]['planet_id'].">".$planets[$i]['name']." ".$langvars['l_tdr_insector']." ".$planets[$i]['sector_id']."</option>";
+                echo "value=".$planets[$i]['planet_id'] . ">" . $planets[$i]['name'] . " " . $langvars['l_tdr_insector'] . " " . $planets[$i]['sector_id'] . "</option>";
                 $i++;
             }
         }
@@ -1546,7 +1546,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
         // Team Planet
         echo "
             </tr><tr>
-            <td align=right><font size=2>Team " . $langvars['l_tdr_planet']." : </font></td>
+            <td align=right><font size=2>Team " . $langvars['l_tdr_planet'] . " : </font></td>
             <td><input type=radio name=\"ptype1\" value=\"team_planet\"
             ";
 
@@ -1562,7 +1562,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
 
         if ($num_team_planets == 0)
         {
-            echo "<option value=none>".$langvars['l_tdr_none']."</option>";
+            echo "<option value=none>".$langvars['l_tdr_none'] . "</option>";
         }
         else
         {
@@ -1576,7 +1576,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
                     echo "selected ";
                 }
 
-                echo "value=".$planets_team[$i]['planet_id'].">".$planets_team[$i]['name']." ".$langvars['l_tdr_insector']." ".$planets_team[$i]['sector_id']."</option>";
+                echo "value=".$planets_team[$i]['planet_id'] . ">" . $planets_team[$i]['name'] . " " . $langvars['l_tdr_insector'] . " " . $planets_team[$i]['sector_id'] . "</option>";
                 $i++;
             }
         }
@@ -1589,9 +1589,9 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
         echo "
             <tr><td>&nbsp;
             </tr><tr>
-            <td align=right><font size=2><strong>" . $langvars['l_tdr_selendpoint']." : <br>&nbsp;</strong></font></td>
+            <td align=right><font size=2><strong>" . $langvars['l_tdr_selendpoint'] . " : <br>&nbsp;</strong></font></td>
             <tr>
-            <td align=right><font size=2>" . $langvars['l_tdr_port']." : </font></td>
+            <td align=right><font size=2>" . $langvars['l_tdr_port'] . " : </font></td>
             <td><input type=radio name=\"ptype2\" value=\"port\"
             ";
 
@@ -1617,7 +1617,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
         // Personal Planet
         echo "
             <tr>
-            <td align=right><font size=2>Personal " . $langvars['l_tdr_planet']." : </font></td>
+            <td align=right><font size=2>Personal " . $langvars['l_tdr_planet'] . " : </font></td>
             <td><input type=radio name=\"ptype2\" value=\"planet\"
             ";
 
@@ -1633,7 +1633,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
 
         if ($num_planets == 0)
         {
-            echo "<option value=none>".$langvars['l_tdr_none']."</option>";
+            echo "<option value=none>".$langvars['l_tdr_none'] . "</option>";
         }
         else
         {
@@ -1647,7 +1647,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
                     echo "selected ";
                 }
 
-                echo "value=".$planets[$i]['planet_id'].">".$planets[$i]['name']." ".$langvars['l_tdr_insector']." ".$planets[$i]['sector_id']."</option>";
+                echo "value=".$planets[$i]['planet_id'] . ">" . $planets[$i]['name'] . " " . $langvars['l_tdr_insector'] . " " . $planets[$i]['sector_id'] . "</option>";
                 $i++;
             }
         }
@@ -1655,7 +1655,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
         // Team Planet
         echo "
             </tr><tr>
-            <td align=right><font size=2>Team " . $langvars['l_tdr_planet']." : </font></td>
+            <td align=right><font size=2>Team " . $langvars['l_tdr_planet'] . " : </font></td>
             <td><input type=radio name=\"ptype2\" value=\"team_planet\"
             ";
 
@@ -1671,7 +1671,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
 
         if ($num_team_planets == 0)
         {
-            echo "<option value=none>".$langvars['l_tdr_none']."</option>";
+            echo "<option value=none>".$langvars['l_tdr_none'] . "</option>";
         }
         else
         {
@@ -1685,7 +1685,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
                     echo "selected ";
                 }
 
-                echo "value=".$planets_team[$i]['planet_id'].">".$planets_team[$i]['name']." ".$langvars['l_tdr_insector']." ".$planets_team[$i]['sector_id']."</option>";
+                echo "value=".$planets_team[$i]['planet_id'] . ">" . $planets_team[$i]['name'] . " " . $langvars['l_tdr_insector'] . " " . $planets_team[$i]['sector_id'] . "</option>";
                 $i++;
             }
         }
@@ -1698,7 +1698,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
             </tr><tr>
             <td>&nbsp;
             </tr><tr>
-            <td align=right><font size=2><strong>" . $langvars['l_tdr_selmovetype']." : </strong></font></td>
+            <td align=right><font size=2><strong>" . $langvars['l_tdr_selmovetype'] . " : </strong></font></td>
             <td colspan=2 valign=top><font size=2><input type=radio name=\"move_type\" value=\"realspace\"
             ";
 
@@ -1708,7 +1708,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
         }
 
         echo "
-            >&nbsp;" . $langvars['l_tdr_realspace']."&nbsp;&nbsp<font size=2><input type=radio name=\"move_type\" value=\"warp\"
+            >&nbsp;" . $langvars['l_tdr_realspace'] . "&nbsp;&nbsp<font size=2><input type=radio name=\"move_type\" value=\"warp\"
             ";
 
         if (!is_null($editroute) && $editroute['move_type'] == 'W')
@@ -1717,9 +1717,9 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
         }
 
         echo "
-            >&nbsp;" . $langvars['l_tdr_warp']."</font></td>
+            >&nbsp;" . $langvars['l_tdr_warp'] . "</font></td>
             </tr><tr>
-            <td align=right><font size=2><strong>" . $langvars['l_tdr_selcircuit']." : </strong></font></td>
+            <td align=right><font size=2><strong>" . $langvars['l_tdr_selcircuit'] . " : </strong></font></td>
             <td colspan=2 valign=top><font size=2><input type=radio name=\"circuit_type\" value=\"1\"
             ";
 
@@ -1729,7 +1729,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
         }
 
         echo "
-            >&nbsp;" . $langvars['l_tdr_oneway']."&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type=radio name=\"circuit_type\" value=\"2\"
+            >&nbsp;" . $langvars['l_tdr_oneway'] . "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type=radio name=\"circuit_type\" value=\"2\"
             ";
 
         if (!is_null($editroute) && $editroute['circuit'] == '2')
@@ -1738,7 +1738,7 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
         }
 
         echo "
-            >&nbsp;" . $langvars['l_tdr_bothways']."</font></td>
+            >&nbsp;" . $langvars['l_tdr_bothways'] . "</font></td>
             </tr><tr>
             <td>&nbsp;
             </tr><tr>
@@ -1747,19 +1747,19 @@ public static function traderouteNew($pdo_db, $db, $lang, \Tki\Reg $tkireg, $tra
 
         if ($editroute === null)
         {
-            echo "<input type=submit value=\"".$langvars['l_tdr_create']."\">";
+            echo "<input type=submit value=\"".$langvars['l_tdr_create'] . "\">";
         }
         else
         {
             echo "<input type=hidden name=editing value=$editroute[traderoute_id]>";
-            echo "<input type=submit value=\"".$langvars['l_tdr_modify']."\">";
+            echo "<input type=submit value=\"".$langvars['l_tdr_modify'] . "\">";
         }
 
-        $langvars['l_tdr_returnmenu'] = str_replace("[here]", "<a href='traderoute.php'>".$langvars['l_here']."</a>", $langvars['l_tdr_returnmenu']);
+        $langvars['l_tdr_returnmenu'] = str_replace("[here]", "<a href='traderoute.php'>".$langvars['l_here'] . "</a>", $langvars['l_tdr_returnmenu']);
 
         echo "
             </table>
-            " . $langvars['l_tdr_returnmenu']."<br>
+            " . $langvars['l_tdr_returnmenu'] . "<br>
             </form>
             ";
 
@@ -1775,7 +1775,7 @@ public static function traderouteDie($pdo_db, $lang, \Tki\Reg $tkireg, $error_ms
     {
         $langvars = \Tki\Translate::load($pdo_db, $lang, array('traderoutes', 'common', 'global_includes', 'global_funcs', 'footer', 'regional'));
 
-        echo "<p>".$error_msg."<p>";
+        echo "<p>".$error_msg . "<p>";
         echo "<div style='text-align:left;'>\n";
         \Tki\Text::gotoMain($pdo_db, $lang, $langvars);
         echo "</div>\n";
@@ -2215,7 +2215,7 @@ public static function traderouteCreate($db, $pdo_db, $lang, \Tki\Reg $tkireg, $
             echo "<p>".$langvars['l_tdr_modified'];
         }
 
-        $langvars['l_tdr_returnmenu'] = str_replace("[here]", "<a href='traderoute.php'>".$langvars['l_here']."</a>", $langvars['l_tdr_returnmenu']);
+        $langvars['l_tdr_returnmenu'] = str_replace("[here]", "<a href='traderoute.php'>".$langvars['l_here'] . "</a>", $langvars['l_tdr_returnmenu']);
         echo " ".$langvars['l_tdr_returnmenu'];
         self::traderouteDie($pdo_db, $lang, $tkireg, null, $template);
     }
@@ -2246,8 +2246,8 @@ public static function traderouteDelete($pdo_db, $db, $lang, $langvars, \Tki\Reg
         {
             $query = $db->Execute("DELETE FROM {$db->prefix}traderoutes WHERE traderoute_id=?;", array($traderoute_id));
             \Tki\Db::logDbErrors($pdo_db, $db, $query, __LINE__, __FILE__);
-            $langvars['l_tdr_returnmenu'] = str_replace("[here]", "<a href='traderoute.php'>".$langvars['l_here']."</a>", $langvars['l_tdr_returnmenu']);
-            echo $langvars['l_tdr_deleted']." ".$langvars['l_tdr_returnmenu'];
+            $langvars['l_tdr_returnmenu'] = str_replace("[here]", "<a href='traderoute.php'>".$langvars['l_here'] . "</a>", $langvars['l_tdr_returnmenu']);
+            echo $langvars['l_tdr_deleted'] . " " . $langvars['l_tdr_returnmenu'];
             self::traderouteDie($pdo_db, $lang, $tkireg, null, $template);
         }
     }
@@ -2256,11 +2256,11 @@ public static function traderouteSettings($pdo_db, $lang, \Tki\Reg $tkireg, $tem
     {
         $langvars = \Tki\Translate::load($pdo_db, $lang, array('traderoutes', 'common', 'global_includes', 'global_funcs', 'footer', 'regional'));
 
-        echo "<p><font size=3 color=blue><strong>".$langvars['l_tdr_globalset']."</strong></font><p>";
-        echo "<font color=white size=2><strong>".$langvars['l_tdr_sportsrc']." :</strong></font><p>".
+        echo "<p><font size=3 color=blue><strong>".$langvars['l_tdr_globalset'] . "</strong></font><p>";
+        echo "<font color=white size=2><strong>".$langvars['l_tdr_sportsrc'] . " :</strong></font><p>".
              "<form accept-charset='utf-8' action=traderoute.php?command=setsettings method=post>".
              "<table border=0><tr>".
-             "<td><font size=2 color=white> - ".$langvars['l_tdr_colonists']." :</font></td>".
+             "<td><font size=2 color=white> - ".$langvars['l_tdr_colonists'] . " :</font></td>".
              "<td><input type=checkbox name=colonists";
 
         if ($playerinfo['trade_colonists'] == 'Y')
@@ -2269,7 +2269,7 @@ public static function traderouteSettings($pdo_db, $lang, \Tki\Reg $tkireg, $tem
         }
 
         echo "></tr><tr>".
-            "<td><font size=2 color=white> - ".$langvars['l_tdr_fighters']." :</font></td>".
+            "<td><font size=2 color=white> - ".$langvars['l_tdr_fighters'] . " :</font></td>".
             "<td><input type=checkbox name=fighters";
 
         if ($playerinfo['trade_fighters'] == 'Y')
@@ -2278,7 +2278,7 @@ public static function traderouteSettings($pdo_db, $lang, \Tki\Reg $tkireg, $tem
         }
 
         echo "></tr><tr>".
-            "<td><font size=2 color=white> - ".$langvars['l_tdr_torps']." :</font></td>".
+            "<td><font size=2 color=white> - ".$langvars['l_tdr_torps'] . " :</font></td>".
             "<td><input type=checkbox name=torps";
 
         if ($playerinfo['trade_torps'] == 'Y')
@@ -2289,9 +2289,9 @@ public static function traderouteSettings($pdo_db, $lang, \Tki\Reg $tkireg, $tem
         echo "></tr>".
             "</table>".
             "<p>".
-            "<font color=white size=2><strong>".$langvars['l_tdr_tdrescooped']." :</strong></font><p>".
+            "<font color=white size=2><strong>".$langvars['l_tdr_tdrescooped'] . " :</strong></font><p>".
             "<table border=0><tr>".
-            "<td><font size=2 color=white>&nbsp;&nbsp;&nbsp;".$langvars['l_tdr_trade']."</font></td>".
+            "<td><font size=2 color=white>&nbsp;&nbsp;&nbsp;".$langvars['l_tdr_trade'] . "</font></td>".
             "<td><input type=radio name=energy value=\"Y\"";
 
         if ($playerinfo['trade_energy'] == 'Y')
@@ -2300,7 +2300,7 @@ public static function traderouteSettings($pdo_db, $lang, \Tki\Reg $tkireg, $tem
         }
 
         echo "></td></tr><tr>".
-            "<td><font size=2 color=white>&nbsp;&nbsp;&nbsp;".$langvars['l_tdr_keep']."</font></td>".
+            "<td><font size=2 color=white>&nbsp;&nbsp;&nbsp;".$langvars['l_tdr_keep'] . "</font></td>".
             "<td><input type=radio name=energy value=\"N\"";
 
         if ($playerinfo['trade_energy'] == 'N')
@@ -2309,11 +2309,11 @@ public static function traderouteSettings($pdo_db, $lang, \Tki\Reg $tkireg, $tem
         }
 
         echo "></td></tr><tr><td>&nbsp;</td></tr><tr><td>".
-            "<td><input type=submit value=\"".$langvars['l_tdr_save']."\"></td>".
+            "<td><input type=submit value=\"" . $langvars['l_tdr_save'] . "\"></td>".
             "</tr></table>".
             "</form>";
 
-        $langvars['l_tdr_returnmenu'] = str_replace("[here]", "<a href='traderoute.php'>".$langvars['l_here']."</a>", $langvars['l_tdr_returnmenu']);
+        $langvars['l_tdr_returnmenu'] = str_replace("[here]", "<a href='traderoute.php'>".$langvars['l_here'] . "</a>", $langvars['l_tdr_returnmenu']);
         echo $langvars['l_tdr_returnmenu'];
         self::traderouteDie($pdo_db, $lang, $tkireg, null, $template);
     }
@@ -2329,8 +2329,8 @@ public static function traderouteSetsettings($db, $pdo_db, $lang, \Tki\Reg $tkir
         $resa = $db->Execute("UPDATE {$db->prefix}ships SET trade_colonists=?, trade_fighters=?, trade_torps=?, trade_energy=? WHERE ship_id=?;", array($colonists, $fighters, $torps, $energy, $playerinfo['ship_id']));
         \Tki\Db::logDbErrors($pdo_db, $db, $resa, __LINE__, __FILE__);
 
-        $langvars['l_tdr_returnmenu'] = str_replace("[here]", "<a href='traderoute.php'>".$langvars['l_here']."</a>", $langvars['l_tdr_returnmenu']);
-        echo $langvars['l_tdr_globalsetsaved']." ".$langvars['l_tdr_returnmenu'];
+        $langvars['l_tdr_returnmenu'] = str_replace("[here]", "<a href='traderoute.php'>".$langvars['l_here'] . "</a>", $langvars['l_tdr_returnmenu']);
+        echo $langvars['l_tdr_globalsetsaved'] . " " . $langvars['l_tdr_returnmenu'];
         self::traderouteDie($pdo_db, $lang, $tkireg, null, $template);
     }
 
@@ -2339,10 +2339,10 @@ public static function traderouteResultsTableTop($pdo_db, $lang, \Tki\Reg $tkire
         $langvars = \Tki\Translate::load($pdo_db, $lang, array('traderoutes', 'common', 'global_includes', 'global_funcs', 'footer', 'regional'));
 
         echo "<table border='1' cellspacing='1' cellpadding='2' width='65%' align='center'>\n";
-        echo "  <tr bgcolor='".$tkireg->color_line2."'>\n";
-        echo "    <td align='center' colspan='7'><strong><font color='white'>".$langvars['l_tdr_res']."</font></strong></td>\n";
+        echo "  <tr bgcolor='" . $tkireg->color_line2 . "'>\n";
+        echo "    <td align='center' colspan='7'><strong><font color='white'>".$langvars['l_tdr_res'] . "</font></strong></td>\n";
         echo "  </tr>\n";
-        echo "  <tr align='center' bgcolor='".$tkireg->color_line2."'>\n";
+        echo "  <tr align='center' bgcolor='".$tkireg->color_line2 . "'>\n";
         echo "    <td width='50%'><font size='2' color='white'><strong>";
     }
 
@@ -2356,7 +2356,7 @@ public static function traderouteResultsDestination(\Tki\Reg $tkireg)
     {
         echo "</strong></font></td>\n";
         echo "  </tr>\n";
-        echo "  <tr bgcolor='".$tkireg->color_line1."'>\n";
+        echo "  <tr bgcolor='".$tkireg->color_line1 . "'>\n";
         echo "    <td align='center'><font size='2' color='white'>";
     }
 
@@ -2370,7 +2370,7 @@ public static function traderouteResultsShowCost(\Tki\Reg $tkireg)
     {
         echo "</font></td>\n";
         echo "  </tr>\n";
-        echo "  <tr bgcolor='".$tkireg->color_line2."'>\n";
+        echo "  <tr bgcolor='".$tkireg->color_line2 . "'>\n";
         echo "    <td align='center'><font size='2' color='white'>";
     }
 
@@ -2397,11 +2397,11 @@ public static function traderouteResultsDisplayTotals($pdo_db, $lang, $total_pro
 
         if ($total_profit > 0)
         {
-            echo "<p><center><font size=3 color=white><strong>".$langvars['l_tdr_totalprofit']." : <font style='color:#0f0;'><strong>".number_format(abs($total_profit), 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])."</strong></font><br>\n";
+            echo "<p><center><font size=3 color=white><strong>".$langvars['l_tdr_totalprofit'] . " : <font style='color:#0f0;'><strong>".number_format(abs($total_profit), 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . "</strong></font><br>\n";
         }
         else
         {
-            echo "<p><center><font size=3 color=white><strong>".$langvars['l_tdr_totalcost']." : <font style='color:#f00;'><strong>".number_format(abs($total_profit), 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])."</strong></font><br>\n";
+            echo "<p><center><font size=3 color=white><strong>".$langvars['l_tdr_totalcost'] . " : <font style='color:#f00;'><strong>".number_format(abs($total_profit), 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . "</strong></font><br>\n";
         }
     }
 
@@ -2412,16 +2412,16 @@ public static function traderouteResultsDisplaySummary($pdo_db, $lang, $tdr_disp
     {
         $langvars = \Tki\Translate::load($pdo_db, $lang, array('traderoutes', 'common', 'global_includes', 'global_funcs', 'footer', 'regional'));
 
-        echo "\n<font size='3' color='white'><strong>".$langvars['l_tdr_turnsused']." : <font style='color:#f00;'>$dist[triptime]</font></strong></font><br>";
-        echo "\n<font size='3' color='white'><strong>".$langvars['l_tdr_turnsleft']." : <font style='color:#0f0;'>$playerinfo[turns]</font></strong></font><br>";
+        echo "\n<font size='3' color='white'><strong>".$langvars['l_tdr_turnsused'] . " : <font style='color:#f00;'>$dist[triptime]</font></strong></font><br>";
+        echo "\n<font size='3' color='white'><strong>".$langvars['l_tdr_turnsleft'] . " : <font style='color:#0f0;'>$playerinfo[turns]</font></strong></font><br>";
 
-        echo "\n<font size='3' color='white'><strong>".$langvars['l_tdr_credits']." : <font style='color:#0f0;'> $tdr_display_creds\n</font></strong></font><br> </strong></font></center>\n";
+        echo "\n<font size='3' color='white'><strong>".$langvars['l_tdr_credits'] . " : <font style='color:#0f0;'> $tdr_display_creds\n</font></strong></font><br> </strong></font></center>\n";
         //echo "<font size='2'>\n";
     }
 
     public static function traderouteResultsShowRepeat($engage)
     {
-        echo "<form accept-charset='utf-8' action='traderoute.php?engage=".$engage."' method='post'>\n";
+        echo "<form accept-charset='utf-8' action='traderoute.php?engage=".$engage . "' method='post'>\n";
         echo "<br>Enter times to repeat <input type='text' name='tr_repeat' value='1' size='5'> <input type='submit' value='submit'>\n";
         echo "</form>\n";
         // echo "<p>";
diff --git a/defence_report.php b/defence_report.php
index 57a817b0c..f9252eff9 100644
--- a/defence_report.php
+++ b/defence_report.php
@@ -87,7 +87,7 @@
     for ($i = 0; $i < $num_sectors; $i++)
     {
         echo "<tr bgcolor=\"$color\">";
-        echo "<td><a href=rsmove.php?engage=1&destination=". $sector[$i]['sector_id'] . ">". $sector[$i]['sector_id'] ."</a></td>";
+        echo "<td><a href=rsmove.php?engage=1&destination=". $sector[$i]['sector_id'] . ">". $sector[$i]['sector_id'] . "</a></td>";
         echo "<td>" . number_format($sector[$i]['quantity'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . "</td>";
         $defence_type = $sector[$i]['defence_type'] == 'F' ? $langvars['l_fighters'] : $langvars['l_mines'];
         echo "<td> $defence_type </td>";
diff --git a/galaxy.php b/galaxy.php
index f39d4edb4..fe77e4bc8 100644
--- a/galaxy.php
+++ b/galaxy.php
@@ -54,7 +54,7 @@
 $map_width = ($div_w + $div_border) * $div_xmax;  // Define the containing div to be the right width to wrap at $div_xmax
 
 // Setup containing div to hold the width of the images
-echo "\n<div id='map' style='position:relative;background-color:#0000ff;width:".$map_width."px'>\n";
+echo "\n<div id='map' style='position:relative;background-color:#0000ff;width:" . $map_width . "px'>\n";
 for ($r = 0; $r < $div_ymax; $r++) // Loop the rows
 {
     for ($c = 0; $c < $div_xmax; $c++) // Loop the columns
@@ -71,7 +71,7 @@
             }
 
             echo "\n<a href=\"rsmove.php?engage=1&amp;destination=" . $row['sector_id'] . "\">";
-            echo "<img class='map ".$row['port_type']."' src='" . $template->getVariables('template_dir') . "/images/" . $tile[$p] . "' alt='" . $alt . "' style='width:20px; height:20px'></a> ";
+            echo "<img class='map ".$row['port_type'] . "' src='" . $template->getVariables('template_dir') . "/images/" . $tile[$p] . "' alt='" . $alt . "' style='width:20px; height:20px'></a> ";
 
             // Move to next explored sector in database results
             $result3->Movenext();
@@ -88,7 +88,7 @@
 
                 // I have not figured out why this formula works, but $row[sector_id] doesn't, so I'm not switching it.
                 echo "<!-- current sector is " . ($c + ($div_xmax * $r)) . " -->";
-                echo "<a href=\"rsmove.php?engage=1&amp;destination=". ($c + ($div_xmax * $r)) ."\">";
+                echo "<a href=\"rsmove.php?engage=1&amp;destination=" . ($c + ($div_xmax * $r)) . "\">";
                 echo "<img class='map un' src='" . $template->getVariables('template_dir') . "/images/" . $tile[$p] . "' alt='" . $alt . "' style='width:20px; height:20px'></a> ";
             }
             $cur_sector++;
@@ -99,7 +99,7 @@
 // This is the row numbers on the side of the map
 for ($a = 1; $a < ($tkireg->max_sectors/50 +1); $a++)
 {
-    echo "\n<div style='position:absolute;left:" . ($map_width + 10)."px;top:".(($a - 1) * ($div_h + $div_border))."px;'>".(($a * 50) - 1)."</div>";
+    echo "\n<div style='position:absolute;left:" . ($map_width + 10) . "px;top:".(($a - 1) * ($div_h + $div_border)) . "px;'>" . (($a * 50) - 1) . "</div>";
 }
 
 echo "</div><div style='clear:both'></div><br>";
diff --git a/mailto.php b/mailto.php
index 371957996..c7aace162 100644
--- a/mailto.php
+++ b/mailto.php
@@ -101,12 +101,12 @@
     echo "        <select name='to' style='width:200px;'>\n";
 
     // Add self to list.
-    echo "          <option".(($playerinfo['character_name']==$name)?" selected":"").">{$playerinfo['character_name']}</option>\n";
+    echo "          <option" . (($playerinfo['character_name']==$name)?" selected":"") . ">{$playerinfo['character_name']}</option>\n";
 
     while (!$res->EOF)
     {
         $row = $res->fields;
-        echo "          <option".(($row['character_name']==$to)?" selected":"").">{$row['character_name']}</option>\n";
+        echo "          <option" . (($row['character_name']==$to)?" selected":"") . ">{$row['character_name']}</option>\n";
         $res->MoveNext();
     }
 
diff --git a/main.php b/main.php
index 9008f15de..e76e20517 100644
--- a/main.php
+++ b/main.php
@@ -455,7 +455,7 @@
 if ($sectorinfo['port_type'] != "none" && mb_strlen($sectorinfo['port_type']) >0)
 {
     echo "<div style='color:#fff; text-align:center; font-size:14px;'>\n";
-    echo "{$langvars['l_tradingport']}:&nbsp;<span style='color:#0f0;'>". ucfirst(Tki\Ports::getType($sectorinfo['port_type'], $langvars)) ."</span>\n";
+    echo "{$langvars['l_tradingport']}:&nbsp;<span style='color:#0f0;'>". ucfirst(Tki\Ports::getType($sectorinfo['port_type'], $langvars)) . "</span>\n";
     echo "<br><br>\n";
     echo "<a class='new_link' style='font-size:14px;' href='port.php' title='Dock with Space Port'><img style='width:100px; height:70px;' class='mnu' src='" . $template->getVariables('template_dir') . "/images/space_station_port.png' alt='Space Station Port'></a>\n";
     echo "</div>\n";
diff --git a/navcomp.php b/navcomp.php
index 0dcc00812..da8a13bfe 100644
--- a/navcomp.php
+++ b/navcomp.php
@@ -125,7 +125,7 @@
 
             for ($j=2; $j<$i; $j++)
             {
-                $search_query = $search_query . ",a".$j.".link_dest ";
+                $search_query = $search_query . ",a" . $j . ".link_dest ";
             }
             $search_query = $search_query . ")";
         }
diff --git a/new2.php b/new2.php
index 7023c7391..e96fbfbf8 100644
--- a/new2.php
+++ b/new2.php
@@ -163,7 +163,7 @@
         mail("$username", $langvars['l_new_topic'], $langvars['l_new_message'] . "\r\n\r\n" . $link_to_game, 'From: ' . $tkireg->admin_mail . "\r\nReply-To: " . $tkireg->admin_mail . "\r\nX-Mailer: PHP/" . phpversion());
 
         Tki\LogMove::writeLog($pdo_db, $shipid['ship_id'], 0); // A new player is placed into sector 0. Make sure his movement log shows it, so they see it on the galaxy map.
-        $resx = $db->Execute("INSERT INTO {$db->prefix}zones VALUES (NULL, ?, ?, 'N', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 0);", array($character ."\'s Territory", $shipid['ship_id']));
+        $resx = $db->Execute("INSERT INTO {$db->prefix}zones VALUES (NULL, ?, ?, 'N', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 0);", array($character . "\'s Territory", $shipid['ship_id']));
         Tki\Db::logDbErrors($pdo_db, $db, $resx, __LINE__, __FILE__);
 
         $resx = $db->Execute("INSERT INTO {$db->prefix}ibank_accounts (ship_id,balance,loan) VALUES (?,0,0);", array($shipid['ship_id']));
diff --git a/planet.php b/planet.php
index eaab4ea9a..07029e32c 100644
--- a/planet.php
+++ b/planet.php
@@ -215,7 +215,7 @@
                 echo $langvars['l_planet_not_selling'];
             }
 
-            $langvars['l_planet_tsell_link'] = "<a href=planet.php?planet_id=$planet_id&command=sell>" . $langvars['l_planet_tsell_link'] ."</a>";
+            $langvars['l_planet_tsell_link'] = "<a href=planet.php?planet_id=$planet_id&command=sell>" . $langvars['l_planet_tsell_link'] . "</a>";
             $langvars['l_planet_tsell'] = str_replace("[selling]", $langvars['l_planet_tsell_link'], $langvars['l_planet_tsell']);
             echo $langvars['l_planet_tsell'] . "<br>";
             if ($planetinfo['base'] == "N")
@@ -229,7 +229,7 @@
                 echo $langvars['l_planet_hasbase'] . "<br>";
             }
 
-            $langvars['l_planet_readlog_link'] = "<a href=log.php>" . $langvars['l_planet_readlog_link'] ."</a>";
+            $langvars['l_planet_readlog_link'] = "<a href=log.php>" . $langvars['l_planet_readlog_link'] . "</a>";
             $langvars['l_planet_readlog'] = str_replace("[View]", $langvars['l_planet_readlog_link'], $langvars['l_planet_readlog']);
             echo "<br>" . $langvars['l_planet_readlog'] . "<br>";
 
@@ -270,7 +270,7 @@
             echo "<tr bgcolor=\"$tkireg->color_line2\"><td>" . $langvars['l_planet_perc'] . "</td>";
             echo "<td><input type=text name=pore value=\"$planetinfo[prod_ore]\" size=6 maxlength=6></td>";
             echo "<td><input type=text name=porganics value=\"$planetinfo[prod_organics]\" size=6 maxlength=6></td>";
-            echo "<td><input type=text name=pgoods value=\"" .round($planetinfo['prod_goods'])."\" size=6 maxlength=6></td>";
+            echo "<td><input type=text name=pgoods value=\"" .round($planetinfo['prod_goods']) . "\" size=6 maxlength=6></td>";
             echo "<td><input type=text name=penergy value=\"$planetinfo[prod_energy]\" size=6 maxlength=6></td>";
             echo "<td>n/a</td><td>*</td>";
             echo "<td><input type=text name=pfighters value=\"$planetinfo[prod_fighters]\" size=6 maxlength=6></td>";
@@ -284,7 +284,7 @@
             // Visitor menu
             if ($planetinfo['sells'] == "Y")
             {
-                $langvars['l_planet_buy_link'] = "<a href=planet.php?planet_id=$planet_id&command=buy>" . $langvars['l_planet_buy_link'] ."</a>";
+                $langvars['l_planet_buy_link'] = "<a href=planet.php?planet_id=$planet_id&command=buy>" . $langvars['l_planet_buy_link'] . "</a>";
                 $langvars['l_planet_buy'] = str_replace("[buy]", $langvars['l_planet_buy_link'], $langvars['l_planet_buy']);
                 echo $langvars['l_planet_buy'] . "<br>";
             }
@@ -311,9 +311,9 @@
                 }
                 else
                 {
-                    $langvars['l_planet_att_link'] = "<a href=planet.php?planet_id=$planet_id&command=attac>" . $langvars['l_planet_att_link'] ."</a>";
+                    $langvars['l_planet_att_link'] = "<a href=planet.php?planet_id=$planet_id&command=attac>" . $langvars['l_planet_att_link'] . "</a>";
                     $langvars['l_planet_att'] = str_replace("[attack]", $langvars['l_planet_att_link'], $langvars['l_planet_att']);
-                    $langvars['l_planet_scn_link'] = "<a href=planet.php?planet_id=$planet_id&command=scan>" . $langvars['l_planet_scn_link'] ."</a>";
+                    $langvars['l_planet_scn_link'] = "<a href=planet.php?planet_id=$planet_id&command=scan>" . $langvars['l_planet_scn_link'] . "</a>";
                     $langvars['l_planet_scn'] = str_replace("[scan]", $langvars['l_planet_scn_link'], $langvars['l_planet_scn']);
                     echo $langvars['l_planet_att'] . "<br>";
                     echo $langvars['l_planet_scn'] . "<br>";
@@ -543,7 +543,7 @@
             // Check to see if sure
             if ($planetinfo['sells'] == "Y")
             {
-                $langvars['l_planet_buy_link'] = "<a href=planet.php?planet_id=$planet_id&command=buy>" . $langvars['l_planet_buy_link'] ."</a>";
+                $langvars['l_planet_buy_link'] = "<a href=planet.php?planet_id=$planet_id&command=buy>" . $langvars['l_planet_buy_link'] . "</a>";
                 $langvars['l_planet_buy'] = str_replace("[buy]", $langvars['l_planet_buy_link'], $langvars['l_planet_buy']);
                 echo $langvars['l_planet_buy'] . "<br>";
             }
@@ -564,7 +564,7 @@
                 {
                     $langvars['l_planet_att_link'] = "<a href=planet.php?planet_id=$planet_id&command=attack>" . $langvars['l_planet_att_link'] . " .</a>";
                     $langvars['l_planet_att'] = str_replace("[attack]", $langvars['l_planet_att_link'], $langvars['l_planet_att']);
-                    $langvars['l_planet_scn_link'] = "<a href=planet.php?planet_id=$planet_id&command=scan>" . $langvars['l_planet_scn_link'] ."</a>";
+                    $langvars['l_planet_scn_link'] = "<a href=planet.php?planet_id=$planet_id&command=scan>" . $langvars['l_planet_scn_link'] . "</a>";
                     $langvars['l_planet_scn'] = str_replace("[scan]", $langvars['l_planet_scn_link'], $langvars['l_planet_scn']);
                     echo $langvars['l_planet_att'] . " <strong>" . $langvars['l_planet_att_sure'] . "</strong><br>";
                     echo $langvars['l_planet_scn'] . "<br>";
@@ -607,7 +607,7 @@
             // Check to see if sure...
             if ($planetinfo['sells'] == "Y" && $tkireg->allow_sofa)
             {
-                $langvars['l_planet_buy_link'] = "<a href=planet.php?planet_id=$planet_id&command=buy>" . $langvars['l_planet_buy_link'] ."</a>";
+                $langvars['l_planet_buy_link'] = "<a href=planet.php?planet_id=$planet_id&command=buy>" . $langvars['l_planet_buy_link'] . "</a>";
                 $langvars['l_planet_buy'] = str_replace("[buy]", $langvars['l_planet_buy_link'], $langvars['l_planet_buy']);
                 echo $langvars['l_planet_buy'] . "<br>";
             }
@@ -616,9 +616,9 @@
                 echo $langvars['l_planet_not_selling'] . "<br>";
             }
 
-            $langvars['l_planet_att_link'] = "<a href=planet.php?planet_id=$planet_id&command=attac>" . $langvars['l_planet_att_link'] ."</a>";
+            $langvars['l_planet_att_link'] = "<a href=planet.php?planet_id=$planet_id&command=attac>" . $langvars['l_planet_att_link'] . "</a>";
             $langvars['l_planet_att'] = str_replace("[attack]", $langvars['l_planet_att_link'], $langvars['l_planet_att']);
-            $langvars['l_planet_scn_link'] ="<a href=planet.php?planet_id=$planet_id&command=scan>" . $langvars['l_planet_scn_link'] ."</a>";
+            $langvars['l_planet_scn_link'] ="<a href=planet.php?planet_id=$planet_id&command=scan>" . $langvars['l_planet_scn_link'] . "</a>";
             $langvars['l_planet_scn'] = str_replace("[scan]", $langvars['l_planet_scn_link'], $langvars['l_planet_scn']);
             echo $langvars['l_planet_att'] . "<br>";
             echo $langvars['l_planet_scn'] . "<br>";
diff --git a/planet_report.php b/planet_report.php
index dcc904f1e..16072e525 100644
--- a/planet_report.php
+++ b/planet_report.php
@@ -40,13 +40,13 @@
 // Determine what type of report is displayed and display it's title
 if ($preptype == 1 || !isset($preptype)) // Display the commodities on the planets
 {
-    $title = $title .": Status";
+    $title = $title . ": Status";
     echo "<h1>" . $title . "</h1>\n";
     Bad\PlanetReport::standardReport($pdo_db, $db, $langvars, $playerinfo, $sort, $tkireg);
 }
 elseif ($preptype == 2)                  // Display the production values of your planets and allow changing
 {
-    $title = $title .": Production";
+    $title = $title . ": Production";
     echo "<h1>" . $title . "</h1>\n";
     Bad\PlanetReport::planetProductionChange($pdo_db, $db, $langvars, $playerinfo, $sort, $tkireg);
 }
diff --git a/port.php b/port.php
index fb55133ed..ae294fbbf 100644
--- a/port.php
+++ b/port.php
@@ -378,7 +378,7 @@
                         echo "Partial Payment Mode<br>\n";
                         echo "You don't have enough Credits within your Intergalactic Bank Account to pay your entire bounty.<br>\n";
                         echo "However you can pay your bounty off in instalments.<br>\n";
-                        echo "And your first instalment will be " . number_format($bounty_payment, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])." credits.<br>\n";
+                        echo "And your first instalment will be " . number_format($bounty_payment, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " credits.<br>\n";
                         echo "<br>\n";
 
                         $resx = $db->Execute("UPDATE {$db->prefix}ibank_accounts SET balance = balance - ? WHERE ship_id = ?;", array($bounty_payment, $playerinfo['ship_id']));
@@ -613,7 +613,7 @@
 
     if ($playerinfo['ship_colonists'] != $colonist_max)
     {
-        echo "+ form.colonist_number.value * " . $tkireg->colonist_price ." ";
+        echo "+ form.colonist_number.value * " . $tkireg->colonist_price . " ";
     }
 
     echo ";\n";
diff --git a/port2.php b/port2.php
index c5fe43d2d..e369a8e67 100644
--- a/port2.php
+++ b/port2.php
@@ -91,7 +91,7 @@ function build_one_col($text = "&nbsp;", $align = "left")
 {
     echo "
     <tr>
-      <td colspan=99 align=".$align.">".$text.".</td>
+      <td colspan=99 align=" . $align . ">".$text . ".</td>
     </tr>
     ";
 }
@@ -100,8 +100,8 @@ function build_two_col($text_col1 = "&nbsp;", $text_col2 = "&nbsp;", $align_col1
 {
     echo "
     <tr>
-      <td align=".$align_col1.">".$text_col1."</td>
-      <td align=".$align_col2.">".$text_col2."</td>
+      <td align=" . $align_col1 . ">" . $text_col1 . "</td>
+      <td align=" . $align_col2 . ">" . $text_col2 . "</td>
     </tr>";
 }
 
@@ -490,7 +490,7 @@ function php_change_delta($desired_value, $current_value, $upgrade_cost)
             if ($dev_beacon_number)
             {
                 $query = $query . ", dev_beacon = dev_beacon + $dev_beacon_number";
-                build_two_col($langvars['l_beacons']. " " .$langvars['l_trade_added'].":", $dev_beacon_number, "left", "right");
+                build_two_col($langvars['l_beacons']. " " .$langvars['l_trade_added'] . ":", $dev_beacon_number, "left", "right");
             }
 
             if ($dev_emerwarp_number)
@@ -606,7 +606,7 @@ function trade($price, $delta, $max, $limit, $factor, $port_type, $origin, $pric
 
             // Debug info
             // echo "$origin * $price_array[$port_type]=";
-            // echo $origin * $price_array[$port_type]."<br>";
+            // echo $origin * $price_array[$port_type] . "<br>";
             return $origin;
         }
 
@@ -705,7 +705,7 @@ function trade($price, $delta, $max, $limit, $factor, $port_type, $origin, $pric
                         <td colspan=99 align=center><font size=3 color=white><strong>" . $langvars['l_trade_result'] . "</strong></font></td>
                     </tr>
                     <tr>
-                        <td colspan=99 align=center><strong><font style='color:{$trade_color};'>". $trade_result ." " . number_format(abs($total_cost), 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_credits'] . "</font></strong></td>
+                        <td colspan=99 align=center><strong><font style='color:{$trade_color};'>". $trade_result . " " . number_format(abs($total_cost), 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . " " . $langvars['l_credits'] . "</font></strong></td>
                     </tr>
                     <tr bgcolor=$tkireg->color_line1>
                         <td><strong><font size=2 color=white>" . $langvars['l_traded_ore'] . ": </font><strong></td><td align=right><strong><font size=2 color=white>" . number_format($trade_ore, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . "</font></strong></td>
diff --git a/scan.php b/scan.php
index 63eb58c71..25c1163f3 100644
--- a/scan.php
+++ b/scan.php
@@ -138,7 +138,7 @@
             }
 
             $sc_error = Tki\Scan::error($playerinfo['sensors'], $targetinfo['cloak'], $scan_error_factor);
-            echo $langvars['l_scan_ron'] ." " . $targetinfo['ship_name'] . ", " . $langvars['l_scan_capt'] . " " . $targetinfo['character_name'] . "<br><br>";
+            echo $langvars['l_scan_ron'] . " " . $targetinfo['ship_name'] . ", " . $langvars['l_scan_capt'] . " " . $targetinfo['character_name'] . "<br><br>";
             echo "<strong>" . $langvars['l_ship_levels'] . ":</strong><br><br>";
             echo "<table  width=\"\" border=\"0\" cellspacing=\"0\" cellpadding=\"4\">";
             echo "<tr><td>" . $langvars['l_hull'] . ":</td>";
diff --git a/scheduler.php b/scheduler.php
index 098fb3fe9..a6994fe72 100644
--- a/scheduler.php
+++ b/scheduler.php
@@ -174,7 +174,7 @@ function is_query_ok($pdo_db, $db, $res)
     if (abs($schedDiff) > ($tkireg->sched_ticks * 60))
     {
         // Hmmm, seems that we have missed at least 1 update, so log it to the admin.
-        Tki\AdminLog::writeLog($pdo_db, $db, 2468, "Detected Scheduler Issue|{$lastRun}|". time() ."|". (time() - ($tkireg->sched_ticks * 60)) ."|{$schedDiff}|". serialize($lastrunList));
+        Tki\AdminLog::writeLog($pdo_db, $db, 2468, "Detected Scheduler Issue|{$lastRun}|". time() . "|" . (time() - ($tkireg->sched_ticks * 60)) . "|{$schedDiff}|" . serialize($lastrunList));
     }
 
     $runtime = time() - $starttime;
diff --git a/setup_info.php b/setup_info.php
index 4f566bf86..e21ed693a 100644
--- a/setup_info.php
+++ b/setup_info.php
@@ -121,7 +121,7 @@
 {
     $err_msg = "Unable to connect to the " . $db_type .
                " Database.<br>\n Database Error: ".
-               $e->getMessage() ."<br>\n";
+               $e->getMessage() . "<br>\n";
     $variables['pdo_conn_test'] = false;
     $variables['pdo_conn_err'] = $err_msg;
 }
diff --git a/team_planets.php b/team_planets.php
index cae842739..407ac498f 100644
--- a/team_planets.php
+++ b/team_planets.php
@@ -147,7 +147,7 @@
         $player = $res->fields['character_name'];
 
         echo "<tr bgcolor=\"$color\">";
-        echo "<td><a href=rsmove.php?engage=1&destination=". $planet[$i]['sector_id'] . ">". $planet[$i]['sector_id'] ."</a></td>";
+        echo "<td><a href=rsmove.php?engage=1&destination=". $planet[$i]['sector_id'] . ">". $planet[$i]['sector_id'] . "</a></td>";
         echo "<td>" . $planet[$i]['name']              . "</td>";
         echo "<td>" . number_format($planet[$i]['ore'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])       . "</td>";
         echo "<td>" . number_format($planet[$i]['organics'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep'])  . "</td>";
diff --git a/teams.php b/teams.php
index cf00071a8..df5435c03 100644
--- a/teams.php
+++ b/teams.php
@@ -293,7 +293,7 @@
                     }
                 }
 
-                Tki\PlayerLog::writeLog($pdo_db, $db, $playerinfo['ship_id'], LOG_TEAM_NEWLEAD, $team['team_name'] ."|". $newcreatorname['character_name']);
+                Tki\PlayerLog::writeLog($pdo_db, $db, $playerinfo['ship_id'], LOG_TEAM_NEWLEAD, $team['team_name'] . "|" . $newcreatorname['character_name']);
                 Tki\PlayerLog::writeLog($pdo_db, $db, $newcreator, LOG_TEAM_LEAD, $team['team_name']);
             }
 
@@ -317,7 +317,7 @@
 
                     echo $langvars['l_team_welcome'] . " <strong>" . $team['team_name'] . "</strong>.<br><br>";
                     Tki\PlayerLog::writeLog($pdo_db, $db, $playerinfo['ship_id'], LOG_TEAM_JOIN, $team['team_name']);
-                    Tki\PlayerLog::writeLog($pdo_db, $db, $team['creator'], LOG_TEAM_NEWMEMBER, $team['team_name'] ."|". $playerinfo['character_name']);
+                    Tki\PlayerLog::writeLog($pdo_db, $db, $team['creator'], LOG_TEAM_NEWMEMBER, $team['team_name'] . "|" . $playerinfo['character_name']);
                 }
                 else
                 {
@@ -489,7 +489,7 @@
             echo $langvars['l_team_refuse'] . " <strong>" . $invite_info['team_name'] . "</strong>.<br><br>";
             $resx = $db->Execute("UPDATE {$db->prefix}ships SET team_invite = 0 WHERE ship_id = ?;", array($playerinfo['ship_id']));
             Tki\Db::logDbErrors($pdo_db, $db, $resx, __LINE__, __FILE__);
-            Tki\PlayerLog::writeLog($pdo_db, $db, $team['creator'], LOG_TEAM_REJECT, $playerinfo['character_name'] ."|". $invite_info['team_name']);
+            Tki\PlayerLog::writeLog($pdo_db, $db, $team['creator'], LOG_TEAM_REJECT, $playerinfo['character_name'] . "|" . $invite_info['team_name']);
             echo "<br><br><a href=\"teams.php\">" . $langvars['l_clickme'] . "</a> " . $langvars['l_team_menu'] . ".<br><br>";
             break;
 
diff --git a/warpedit.php b/warpedit.php
index f399b744b..0788b4a53 100644
--- a/warpedit.php
+++ b/warpedit.php
@@ -93,7 +93,7 @@
 }
 else
 {
-    echo $langvars['l_warp_linkto'] ." ";
+    echo $langvars['l_warp_linkto'] . " ";
     while (!$result2->EOF)
     {
         echo $result2->fields['link_dest'] . " ";
diff --git a/warpedit2.php b/warpedit2.php
index 3328d070d..79bc572c5 100644
--- a/warpedit2.php
+++ b/warpedit2.php
@@ -68,7 +68,7 @@
 {
     // This is the best that I can do without adding a new language variable.
     $langvars['l_warp_twoerror'] = str_replace('[target_sector]', $langvars['l_unknown'], $langvars['l_warp_twoerror']);
-    echo $langvars['l_warp_twoerror'] ."<br><br>";
+    echo $langvars['l_warp_twoerror'] . "<br><br>";
     Tki\Text::gotoMain($pdo_db, $lang, $langvars);
     die();
 }
diff --git a/warpedit3.php b/warpedit3.php
index d56a652e2..b72980ecb 100644
--- a/warpedit3.php
+++ b/warpedit3.php
@@ -67,7 +67,7 @@
 if ($target_sector === null)
 {
     // This is the best that I can do without adding a new language variable.
-    echo $langvars['l_warp_nosector'] ."<br><br>";
+    echo $langvars['l_warp_nosector'] . "<br><br>";
     Tki\Text::gotoMain($pdo_db, $lang, $langvars);
     die();
 }