diff --git a/README.md b/README.md
index 340252b7..6deb8c35 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Also, this project is not meant to be used for commercial puposes of any kind!
 
 ## Requirements
 
-+ Webserver running PHP ≥ 7.1 including extensions:
++ Webserver running PHP ≥ 7.1 — 8.0 including extensions:
   + [SimpleXML](https://www.php.net/manual/en/book.simplexml.php)
   + [GD](https://www.php.net/manual/en/book.image)
   + [MySQL Improved](https://www.php.net/manual/en/book.mysqli.php)
@@ -26,7 +26,7 @@ Also, this project is not meant to be used for commercial puposes of any kind!
   + [File Information](https://www.php.net/manual/en/book.fileinfo.php)
   + [GNU Multiple Precision](https://www.php.net/manual/en/book.gmp.php) (When using TrinityCore as auth source)
 + MySQL ≥ 5.5.30
-+ [TDB 335.21021](https://github.com/TrinityCore/TrinityCore/releases/tag/TDB335.21021)
++ [TDB 335.21101](https://github.com/TrinityCore/TrinityCore/releases/tag/TDB335.21101)
 + Tools require cmake: Please refer to the individual repositories for detailed information
   + [MPQExtractor](https://github.com/Sarjuuk/MPQExtractor) / [FFmpeg](https://ffmpeg.org/download.html) / (optional: [BLPConverter](https://github.com/Sarjuuk/BLPConverter))
   + WIN users may find it easier to use these alternatives
diff --git a/pages/faction.php b/pages/faction.php
index 22f8789b..35a0e691 100644
--- a/pages/faction.php
+++ b/pages/faction.php
@@ -142,7 +142,7 @@ class FactionPage extends GenericPage
                     case 'creature_rate':         $buff .= '[tr][td]'.Lang::game('npcs')                                     .Lang::main('colon').'[/td]'; break;
                     case 'spell_rate':            $buff .= '[tr][td]'.Lang::game('spells')                                   .Lang::main('colon').'[/td]'; break;
                     default:
-                        continue;
+                        continue 2;
                 }
 
                 $buff .= '[td width=35px align=right][span class=q'.($v < 1 ? '10]' : '2]+').intVal(($v - 1) * 100).'%[/span][/td][/tr]';
diff --git a/pages/zone.php b/pages/zone.php
index 633f79a9..6af9e3af 100644
--- a/pages/zone.php
+++ b/pages/zone.php
@@ -253,7 +253,7 @@ class ZonePage extends GenericPage
 
                         $this->extendGlobalData($started->getJSGlobals());
 
-                        if (($tpl['A'] != -1) & ($_ = $started->getSOMData(SIDE_ALLIANCE)))
+                        if (($tpl['A'] != -1) && ($_ = $started->getSOMData(SIDE_ALLIANCE)))
                             $addToSOM('alliancequests', array(
                                 'coords' => [[$spawn['posX'], $spawn['posY']]],
                                 'level'  => $spawn['floor'],
@@ -264,7 +264,7 @@ class ZonePage extends GenericPage
                                 'quests' => array_values($_)
                             ));
 
-                        if (($tpl['H'] != -1) & ($_ = $started->getSOMData(SIDE_HORDE)))
+                        if (($tpl['H'] != -1) && ($_ = $started->getSOMData(SIDE_HORDE)))
                             $addToSOM('hordequests', array(
                                 'coords' => [[$spawn['posX'], $spawn['posY']]],
                                 'level'  => $spawn['floor'],
@@ -350,7 +350,7 @@ class ZonePage extends GenericPage
 
                         $this->extendGlobalData($started->getJSGlobals());
 
-                        if (($tpl['A'] != -1) & ($_ = $started->getSOMData(SIDE_ALLIANCE)))
+                        if (($tpl['A'] != -1) && ($_ = $started->getSOMData(SIDE_ALLIANCE)))
                             $addToSOM('alliancequests', array(
                                 'coords'        => [[$spawn['posX'], $spawn['posY']]],
                                 'level'         => $spawn['floor'],
@@ -363,7 +363,7 @@ class ZonePage extends GenericPage
                                 'quests'        => array_values($_)
                             ));
 
-                        if (($tpl['H'] != -1) & ($_ = $started->getSOMData(SIDE_HORDE)))
+                        if (($tpl['H'] != -1) && ($_ = $started->getSOMData(SIDE_HORDE)))
                             $addToSOM('hordequests', array(
                                 'coords'        => [[$spawn['posX'], $spawn['posY']]],
                                 'level'         => $spawn['floor'],
diff --git a/setup/tools/clisetup/setup.func.php b/setup/tools/clisetup/setup.func.php
index 18173bd4..e627a511 100644
--- a/setup/tools/clisetup/setup.func.php
+++ b/setup/tools/clisetup/setup.func.php
@@ -29,6 +29,7 @@ function setup() : void
         ['dbconfig',          null,                      'testDB',    'Please enter your database credentials.', 'could not establish connection to:'],
         ['siteconfig',        null,                      'testSelf',  'SITE_HOST and STATIC_HOST '.CLI::bold('must').' be set. Also enable FORCE_SSL if needed. You may also want to change other variables such as NAME, NAME_SHORT or LOCALES.', 'could not access:'],
         // sql- and build- stuff here
+        ['SqlGen::generate',  'areatrigger',              null, null, null],
         ['SqlGen::generate',  'achievementcriteria',      null, null, null],
         ['SqlGen::generate',  'glyphproperties',          null, null, null],
         ['SqlGen::generate',  'itemenchantment',          null, null, null],