diff --git a/cache/template/index.html b/cache/template/index.html
old mode 100644
new mode 100755
diff --git a/includes/kernel.php b/includes/kernel.php
index 18e86224..e7d8f73d 100644
--- a/includes/kernel.php
+++ b/includes/kernel.php
@@ -159,11 +159,12 @@ if (!CLI)
 
         define('HOST_URL',   ($secure ? 'https://' : 'http://').$host);
         define('STATIC_URL', ($secure ? 'https://' : 'http://').$host.'/static');
-        if (User::isInGroup(U_GROUP_ADMIN) && !empty($AoWoWconf['aowow']))   // initial set
+
+        if (User::isInGroup(U_GROUP_ADMIN))                 // initial set
         {
-            DB::Aowow()->query('INSERT IGNORE INTO ?_config VALUES (?, ?, ?d, ?), (?, ?, ?d, ?)',
-                'site_host',   $host,           CON_FLAG_TYPE_STRING | CON_FLAG_PERSISTENT, 'default: '.$host.' - points js to executable files (automaticly set on first run)',
-                'static_host', $host.'/static', CON_FLAG_TYPE_STRING | CON_FLAG_PERSISTENT, 'default: '.$host.'/static - points js to images & scripts (automaticly set on first run)'
+            DB::Aowow()->query('REPLACE INTO ?_config VALUES (?a)',
+                [['site_host',   $host,           CON_FLAG_TYPE_STRING | CON_FLAG_PERSISTENT, 'default: '.$host.' - points js to executable files (automaticly set on first run)'],
+                 ['static_host', $host.'/static', CON_FLAG_TYPE_STRING | CON_FLAG_PERSISTENT, 'default: '.$host.'/static - points js to images & scripts (automaticly set on first run)']]
             );
         }
     }
diff --git a/pages/account.php b/pages/account.php
index 72ad15a1..7261f46b 100644
--- a/pages/account.php
+++ b/pages/account.php
@@ -31,6 +31,7 @@ class AccountPage extends GenericPage
         'username'    => [FILTER_SANITIZE_SPECIAL_CHARS, 0xC], // FILTER_FLAG_STRIP_LOW | *_HIGH
         'password'    => [FILTER_UNSAFE_RAW, null],
         'c_password'  => [FILTER_UNSAFE_RAW, null],
+        'token'       => [FILTER_UNSAFE_RAW, null],
         'remember_me' => [FILTER_CALLBACK, ['options' => 'AccountPage::rememberCallback']],
         'email'       => [FILTER_SANITIZE_EMAIL, null]
     );
diff --git a/pages/npc.php b/pages/npc.php
index 3482a478..998b4b5e 100644
--- a/pages/npc.php
+++ b/pages/npc.php
@@ -923,9 +923,9 @@ class NpcPage extends GenericPage
 
     private function getQuotes()
     {
-        $nQuotes    = 0;
-        $quotes     = [];
-        $quoteQuery = '
+        $nQuotes  = 0;
+        $quotes   = [];
+        $quoteSrc = DB::World()->select('
             SELECT
                 ct.groupid AS ARRAY_KEY, ct.id as ARRAY_KEY2, ct.`type`,
                 ct.TextRange AS `range`,
@@ -944,9 +944,11 @@ class NpcPage extends GenericPage
             LEFT JOIN
                 locales_broadcast_text lbct ON ct.BroadcastTextId = lbct.ID
             WHERE
-                ct.entry = ?d';
+                ct.entry = ?d',
+            $this->typeId
+        );
 
-        foreach (DB::World()->select($quoteQuery, $this->typeId) as $text)
+        foreach ($quoteSrc as $text)
         {
             $group = [];
             foreach ($text as $t)
diff --git a/pages/profiles.php b/pages/profiles.php
index 4c164ba2..37fc9bdd 100644
--- a/pages/profiles.php
+++ b/pages/profiles.php
@@ -110,7 +110,7 @@ class ProfilesPage extends GenericPage
 
 
 
-        $this->filter = ['query' => 1];
+        $this->filter = ['query' => 1, 'fi' => []];
 
 
         Lang::sort('game', 'cl');
@@ -121,12 +121,12 @@ class ProfilesPage extends GenericPage
     {
         $classMask = 1 << ($this->character['classs'] - 1);
         $distrib   = DB::Aowow()->selectCol('SELECT COUNT(t.id) FROM dbc_talent t JOIN dbc_talenttab tt ON t.tabId = tt.id WHERE tt.classMask & ?d GROUP BY tt.id ORDER BY tt.tabNumber ASC', $classMask);
-        $result    = [];
+        $result    = [0, 0, 0];
 
         $start = 0;
-        foreach ($distrib as $len)
+        foreach ($distrib as $idx => $len)
         {
-            $result[] = array_sum(str_split(substr($tString, $start, $len)));
+            $result[$idx] = array_sum(str_split(substr($tString, $start, $len)));
             $start += $len;
         }
 
diff --git a/pages/user.php b/pages/user.php
index 75575c43..dd701568 100644
--- a/pages/user.php
+++ b/pages/user.php
@@ -4,7 +4,6 @@ if (!defined('AOWOW_REVISION'))
     die('illegal access');
 
 
-// exclude & weightscales are handled as Ajax
 class UserPage extends GenericPage
 {
     protected $tpl      = 'user';
@@ -28,10 +27,13 @@ class UserPage extends GenericPage
                 $this->notFound(sprintf(Lang::user('notFound'), $pageParam));
         }
         else if (User::$id)
+        {
             header('Location: ?user='.User::$displayName, true, 302);
+            die();
+        }
         else
             $this->forwardToSignIn('user');
-    }
+   }
 
     protected function generateContent()
     {
diff --git a/setup/tools/filegen/simpleImg.func.php b/setup/tools/filegen/simpleImg.func.php
index 64331490..6564467f 100644
--- a/setup/tools/filegen/simpleImg.func.php
+++ b/setup/tools/filegen/simpleImg.func.php
@@ -21,7 +21,7 @@ if (!CLI)
         {
             $result = null;
 
-            if (in_array(substr($path, -4, 4), ['.png', '.blp']))
+            if (in_array(substr($path, -4, 4), ['.png', '.blp', '.BLP', '.PNG']))
                 $path = substr($path, 0, strlen($path) - 4);
 
             $file = $path.'.png';
@@ -44,11 +44,11 @@ if (!CLI)
         if (isset(FileGen::$cliOpts['help']))
         {
             echo "\n";
-            echo "available Options for subScript 'simpleImg':\n";
+            echo "available options for subScript 'simpleImg':\n";
             echo " --icons          (generates square icons that are used for basicly everything)\n";
             echo " --glyphs         (decorative tidbit displayed on Infobox for Glyph Spells)\n";
             echo " --pagetexts      (imagery contained in PageTexts on readable GameObjects or Items)\n";
-            echo " --loadingscreens (loadingscreens (not used, skipped by default))\n";
+            echo " --loadingscreens (loading screens (not used, skipped by default))\n";
 
             return true;
         }
@@ -269,9 +269,9 @@ if (!CLI)
         if (isset($paths[0]) || isset($paths[1]))           // generates icons or glyphs
         {
             if (isset($paths[0]) && !isset($paths[1]))
-                $siRows = DB::Aowow()->selectCol('SELECT iconPath FROM dbc_spellicon WHERE iconPath NOT LIKE "glyph-rune"');
+                $siRows = DB::Aowow()->selectCol('SELECT iconPath FROM dbc_spellicon WHERE iconPath NOT LIKE "%glyph-rune%"');
             else if (!isset($paths[0]) && isset($paths[1]))
-                $siRows = DB::Aowow()->selectCol('SELECT iconPath FROM dbc_spellicon WHERE iconPath LIKE "glyph-rune"');
+                $siRows = DB::Aowow()->selectCol('SELECT iconPath FROM dbc_spellicon WHERE iconPath LIKE "%glyph-rune%"');
             else
                 $siRows = DB::Aowow()->selectCol('SELECT iconPath FROM dbc_spellicon');
 
diff --git a/setup/tools/imagecreatefromblp.func.php b/setup/tools/imagecreatefromblp.func.php
index dd226ed7..c719b585 100644
--- a/setup/tools/imagecreatefromblp.func.php
+++ b/setup/tools/imagecreatefromblp.func.php
@@ -33,7 +33,7 @@
     {
         if (!CLISetup::fileExists($fileName))
         {
-            CLISetup::log('file '.$fileName.' could not be found', MSG_LVL_ERROR);
+            CLISetup::log('file '.$fileName.' could not be found', CLISetup::LOG_ERROR);
             return;
         }
 
@@ -41,14 +41,14 @@
 
         if (!$file)
         {
-            CLISetup::log('could not open file '.$fileName, MSG_LVL_ERROR);
+            CLISetup::log('could not open file '.$fileName, CLISetup::LOG_ERROR);
             return;
         }
 
         $fileSize = fileSize($fileName);
         if ($fileSize < 16)
         {
-            CLISetup::log('file '.$fileName.' is too small for a BLP file', MSG_LVL_ERROR);
+            CLISetup::log('file '.$fileName.' is too small for a BLP file', CLISetup::LOG_ERROR);
             return;
         }
 
@@ -64,14 +64,14 @@
                 $data = substr($data, 0x44);
             else
             {
-                CLISetup::log('file '.$fileName.' is an incremental patch file and cannot be used by this script.', MSG_LVL_ERROR);
+                CLISetup::log('file '.$fileName.' is an incremental patch file and cannot be used by this script.', CLISetup::LOG_ERROR);
                 return;
             }
         }
 
         if (substr($data, 0, 4) != "BLP2")
         {
-            CLISetup::log('file '.$fileName.' has incorrect/unsupported magic bytes', MSG_LVL_ERROR);
+            CLISetup::log('file '.$fileName.' has incorrect/unsupported magic bytes', CLISetup::LOG_ERROR);
             return;
         }
 
@@ -83,7 +83,7 @@
 
         if ($header['format'] != 1)
         {
-            CLISetup::log('file '.$fileName.' has unsupported format'.$debugStr, MSG_LVL_ERROR);
+            CLISetup::log('file '.$fileName.' has unsupported format'.$debugStr, CLISetup::LOG_ERROR);
             return;
         }
 
@@ -99,12 +99,12 @@
 
         if ($size == 0)
         {
-            CLISetup::log('file '.$fileName.' contains zeroes in a mips table'.$debugStr, MSG_LVL_ERROR);
+            CLISetup::log('file '.$fileName.' contains zeroes in a mips table'.$debugStr, CLISetup::LOG_ERROR);
             return;
         }
         if ($offs + $size > $fileSize)
         {
-            CLISetup::log('file '.$fileName.' is corrupted/incomplete'.$debugStr, MSG_LVL_ERROR);
+            CLISetup::log('file '.$fileName.' is corrupted/incomplete'.$debugStr, CLISetup::LOG_ERROR);
             return;
         }
 
@@ -116,7 +116,7 @@
             $img = icfb3($header['width'], $header['height'], substr($data, $offs, $size));
         else
         {
-            CLISetup::log('file '.$fileName.' has unsupported type'.$debugStr, MSG_LVL_ERROR);
+            CLISetup::log('file '.$fileName.' has unsupported type'.$debugStr, CLISetup::LOG_ERROR);
             return;
         }
 
@@ -152,7 +152,7 @@
     {
         if (!in_array($alphaBits * 10 + $alphaType, [0, 10, 41, 81, 87, 88]))
         {
-            CLISetup::log('unsupported compression type', MSG_LVL_ERROR);
+            CLISetup::log('unsupported compression type', CLISetup::LOG_ERROR);
             return;
         }
 
diff --git a/static/js/user.js b/static/js/user.js
index ead84545..40b34959 100644
--- a/static/js/user.js
+++ b/static/js/user.js
@@ -596,4 +596,4 @@ Listview.extraCols.signature = {
         $WH.ae(a, $WH.ce('img', { src: '?signature=generate&id=' + sig.id + '.png', height: 60, width: 468 }));
         $WH.ae(td, a);
     }
-};
\ No newline at end of file
+};