diff --git a/gatherling/admin/clean_decks.php b/gatherling/admin/clean_decks.php
index 74e5637f..7e06b5fe 100644
--- a/gatherling/admin/clean_decks.php
+++ b/gatherling/admin/clean_decks.php
@@ -1,5 +1,9 @@
 <?php
 
+use Gatherling\Database;
+use Gatherling\Deck;
+use Gatherling\Player;
+
 require '../lib.php';
 
 session_start();
diff --git a/gatherling/admin/db-upgrade.php b/gatherling/admin/db-upgrade.php
index 8c051626..92a1b5fd 100644
--- a/gatherling/admin/db-upgrade.php
+++ b/gatherling/admin/db-upgrade.php
@@ -813,6 +813,12 @@ function redirect_deck_update($latest_id = 0)
     do_query('ALTER TABLE `players`
             CHANGE COLUMN `discord_id` `discord_id` VARCHAR(20) NULL DEFAULT NULL AFTER `theme`;');
 });
+upgrade_db(50, 'Fix series discord fields', function () {
+    do_query('ALTER TABLE `series`
+	        CHANGE COLUMN `discord_guild_id` `discord_guild_id` VARCHAR(20) NULL DEFAULT NULL AFTER `mtgo_room`,
+	        ADD COLUMN `discord_channel_id` VARCHAR(20) NULL DEFAULT NULL AFTER `discord_guild_id`,
+	        CHANGE COLUMN `discord_require_membership` `discord_require_membership` INT NULL DEFAULT NULL AFTER `discord_guild_invite`;');
+});
 $db->autocommit(true);
 
 info('DB is up to date!');
diff --git a/gatherling/api.php b/gatherling/api.php
index f25612af..69e78847 100644
--- a/gatherling/api.php
+++ b/gatherling/api.php
@@ -38,9 +38,9 @@
         try {
             $series = new Series($seriesname);
             $result = repr_json_series($series);
-            $result['sucess'] = true;
+            $result['success'] = true;
         } catch (Exception $e) {
-            $result['sucess'] = false;
+            $result['success'] = false;
             $result['error'] = $e->getMessage();
         }
         break;
diff --git a/gatherling/api_lib.php b/gatherling/api_lib.php
index 3ff2f0f8..0cfde655 100644
--- a/gatherling/api_lib.php
+++ b/gatherling/api_lib.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once 'lib.php';
+
 //## Helper Functions
 
 use Gatherling\Event;
@@ -16,6 +18,7 @@ function populate($array, $src, $keys)
     return $array;
 }
 
+/** @return bool  */
 function is_admin()
 {
     if (!isset($_SESSION['infobot'])) {
@@ -62,6 +65,12 @@ function auth()
     return Player::isLoggedIn();
 }
 
+/**
+ * @param string $msg
+ * @param mixed  $extra
+ *
+ * @return never
+ */
 function error($msg, $extra = null)
 {
     $result = [];
@@ -74,6 +83,12 @@ function error($msg, $extra = null)
     exit(json_encode($result));
 }
 
+/**
+ * @param string $key
+ * @param mixed  $default
+ *
+ * @return mixed
+ */
 function arg($key, $default = null)
 {
     if (!isset($_REQUEST[$key])) {
@@ -181,9 +196,14 @@ function repr_json_deck($deck)
     return $json;
 }
 
+/**
+ * @param Gatherling\Series $series
+ *
+ * @return mixed
+ */
 function repr_json_series($series)
 {
-    $json = populate([], $series, ['name', 'active', 'start_day', 'start_time', 'organizers', 'mtgo_room', 'this_season_format', 'this_season_master_link', 'this_season_season']);
+    $json = populate([], $series, ['name', 'active', 'start_day', 'start_time', 'organizers', 'mtgo_room', 'this_season_format', 'this_season_master_link', 'this_season_season', 'discord_guild_id', 'discord_channel_id', 'discord_channel_name', 'discord_guild_name']);
 
     return $json;
 }
@@ -272,6 +292,13 @@ function drop_player_from_event($event, $name)
     return $result;
 }
 
+/**
+ * @param string $newseries
+ * @param bool   $active
+ * @param string $day
+ *
+ * @return array
+ */
 function create_series($newseries, $active, $day)
 {
     $result = [];
diff --git a/gatherling/models/Decksearch.php b/gatherling/models/Decksearch.php
index 1e69b14f..87981a99 100644
--- a/gatherling/models/Decksearch.php
+++ b/gatherling/models/Decksearch.php
@@ -151,7 +151,7 @@ public function searchByMedals($medal)
      *
      *  @param [$color_str_input] Array of the input color
      *
-     *  @return mixed true if success/false otherwise
+     * @return mixed true if success/false otherwise
      */
     public function searchByColor($color_str_input)
     {
diff --git a/gatherling/models/Event.php b/gatherling/models/Event.php
index 947051cf..637cf2b5 100644
--- a/gatherling/models/Event.php
+++ b/gatherling/models/Event.php
@@ -499,6 +499,11 @@ public function getTrophyImageLink()
            .self::trophy_image_tag($this->name)."\n</a>\n";
     }
 
+    /**
+     * @param string $name
+     *
+     * @return bool
+     */
     public function isHost($name)
     {
         $ishost = !is_null($this->host) && strcasecmp($name, $this->host) == 0;
@@ -507,11 +512,17 @@ public function isHost($name)
         return $ishost || $iscohost;
     }
 
+    /** @return bool  */
     public function isFinalized()
     {
         return $this->finalized != 0;
     }
 
+    /**
+     * @param string $name
+     *
+     * @return bool
+     */
     public function isOrganizer($name)
     {
         $isOrganizer = false;
@@ -528,6 +539,11 @@ public function isOrganizer($name)
         return $isOrganizer;
     }
 
+    /**
+     * @param string $playername
+     *
+     * @return bool
+     */
     public function authCheck($playername)
     {
         $player = new Player($playername);
@@ -541,6 +557,11 @@ public function authCheck($playername)
         return false;
     }
 
+    /**
+     * @throws Exception
+     *
+     * @return int
+     */
     public function getPlayerCount()
     {
         return Database::single_result_single_param('SELECT count(*) FROM entries WHERE event_id = ?', 'd', $this->id);
@@ -1707,6 +1728,8 @@ public function AssignMedalsbyStandings()
 
         $t8 = [];
         $t4 = [];
+        $sec = null;
+        $win = null;
 
         switch ($medalCount) {
             case 8:
diff --git a/gatherling/models/Pagination.php b/gatherling/models/Pagination.php
index 1a95530e..828a6ec6 100644
--- a/gatherling/models/Pagination.php
+++ b/gatherling/models/Pagination.php
@@ -97,7 +97,7 @@ class Pagination
      *
      *  Initializes the class and the default properties.
      *
-     *  @return void
+     * @return void
      */
     public function __construct()
     {
@@ -117,14 +117,14 @@ public function __construct()
      *  $pagination->always_show_navigation(false);
      *  </code>
      *
-     *  @param  bool     $show   (Optional) If set to FALSE, the "previous page" and "next page" links will only be
-     *                              shown if there are more pages than set through {@link selectable_pages()}.
+     * @param bool $show (Optional) If set to FALSE, the "previous page" and "next page" links will only be
+     *                   shown if there are more pages than set through {@link selectable_pages()}.
      *
      *                              Default is TRUE.
      *
      *  @since  2.0
      *
-     *  @return void
+     * @return void
      */
     public function always_show_navigation($show = true)
     {
@@ -150,14 +150,14 @@ public function always_show_navigation($show = true)
      *  $pagination->avoid_duplicate_content(false);
      *  </code>
      *
-     *  @param  bool     $avoid_duplicate_content    (Optional) If set to FALSE, the library will have for the first
-     *                                                  page (or last, if you are displaying links in {@link reverse() reverse}
-     *                                                  order) a different path than the one you have when you are accessing
-     *                                                  the page for the first (unpaginated) time.
+     * @param bool $avoid_duplicate_content (Optional) If set to FALSE, the library will have for the first
+     *                                      page (or last, if you are displaying links in {@link reverse() reverse}
+     *                                      order) a different path than the one you have when you are accessing
+     *                                      the page for the first (unpaginated) time.
      *
      *                                                  Default is TRUE.
      *
-     *  @return void
+     * @return void
      *
      *  @since  2.0
      */
@@ -201,17 +201,17 @@ public function avoid_duplicate_content($avoid_duplicate_content = true)
      *
      *  <samp>If you want to preserve the hash in the URL, make sure you load the zebra_pagination.js file!</samp>
      *
-     *  @param  string      $base_url                   (Optional) The base URL to be used when generating the navigation
-     *                                                  links
+     * @param string $base_url (Optional) The base URL to be used when generating the navigation
+     *                         links
      *
      *                                                  Defaults is whatever returned by
      *                                                  {@link http://www.php.net/manual/en/reserved.variables.server.php $_SERVER['REQUEST_URI']}
-     *  @param  bool     $preserve_query_string      (Optional) Indicates whether values in query strings, other than
-     *                                                  those set in $base_url, should be preserved
+     * @param bool $preserve_query_string (Optional) Indicates whether values in query strings, other than
+     *                                    those set in $base_url, should be preserved
      *
      *                                                  Default is TRUE
      *
-     *  @return void
+     * @return void
      */
     public function base_url($base_url = '', $preserve_query_string = true)
     {
@@ -242,7 +242,7 @@ public function base_url($base_url = '', $preserve_query_string = true)
      *  echo $pagination->get_page();
      *  </code>
      *
-     *  @return int     Returns the current page's number
+     * @return int Returns the current page's number
      */
     public function get_page()
     {
@@ -318,8 +318,8 @@ public function get_page()
      *
      *  @since  2.1
      *
-     *  @return int     Returns the total number of pages, based on the total number of records and the number of
-     *                      records to be shown per page.
+     * @return int Returns the total number of pages, based on the total number of records and the number of
+     *             records to be shown per page.
      */
     public function get_pages()
     {
@@ -335,14 +335,14 @@ public function get_pages()
      *  $pagination->labels('Previous', 'Next');
      *  </code>
      *
-     *  @param  string  $previous   (Optional) The label for the "previous page" link.
+     * @param string $previous (Optional) The label for the "previous page" link.
      *
      *                              Default is "Previous page".
-     *  @param  string  $next       (Optional) The label for the "next page" link.
+     * @param string $next (Optional) The label for the "next page" link.
      *
      *                              Default is "Next page".
      *
-     *  @return void
+     * @return void
      *
      *  @since  2.0
      */
@@ -361,7 +361,7 @@ public function labels($previous = 'Previous page', $next = 'Next page')
      *  $pagination->method('url');
      *  </code>
      *
-     *  @param  string  $method     (Optional) The method to be used for page propagation.
+     * @param string $method (Optional) The method to be used for page propagation.
      *
      *                              Values can be:
      *
@@ -398,8 +398,8 @@ public function method($method = 'get')
      *  These links can also be shown both on the left or on the right of the links to individual pages by setting the
      *  method's argument to "left" or "right" respectively.
      *
-     *  @param  string  $position   Setting this argument to "left" or "right" will instruct the script to show next/previous
-     *                              page links on the left or on the right of the links to individual pages.
+     * @param string $position Setting this argument to "left" or "right" will instruct the script to show next/previous
+     *                         page links on the left or on the right of the links to individual pages.
      *
      *                              Allowed values are "left", "right" and "outside".
      *
@@ -407,7 +407,7 @@ public function method($method = 'get')
      *
      *  @since  2.1
      *
-     *  @return void
+     * @return void
      */
     public function navigation_position($position)
     {
@@ -425,12 +425,12 @@ public function navigation_position($position)
      *  $pagination->padding(false);
      *  </code>
      *
-     *  @param  bool     $enabled    (Optional) Setting this property to FALSE will disable padding rather than
-     *                                  enabling it.
+     * @param bool $enabled (Optional) Setting this property to FALSE will disable padding rather than
+     *                      enabling it.
      *
      *                                  Default is TRUE.
      *
-     *  @return void
+     * @return void
      */
     public function padding($enabled = true)
     {
@@ -451,9 +451,9 @@ public function padding($enabled = true)
      *  $pagination->records(100);
      *  </code>
      *
-     *  @param  int     $records    The total number of records that need to be paginated
+     * @param int $records The total number of records that need to be paginated
      *
-     *  @return void
+     * @return void
      */
     public function records($records)
     {
@@ -474,11 +474,11 @@ public function records($records)
      *  $pagination->records_per_page(20);
      *  </code>
      *
-     *  @param  int     $records_per_page   The number of records displayed on one page.
+     * @param int $records_per_page The number of records displayed on one page.
      *
      *                      Default is 10.
      *
-     *  @return void
+     * @return void
      */
     public function records_per_page($records_per_page)
     {
@@ -498,12 +498,12 @@ public function records_per_page($records_per_page)
      *  $output = $pagination->render(true);
      *  </code>
      *
-     *  @param  bool     $return_output      (Optional) Setting this argument to TRUE will instruct the script to
-     *                                          return the generated output rather than outputting it to the screen.
+     * @param bool $return_output (Optional) Setting this argument to TRUE will instruct the script to
+     *                            return the generated output rather than outputting it to the screen.
      *
      *                                          Default is FALSE.
      *
-     *  @return void
+     * @return void
      */
     public function render($return_output = false)
     {
@@ -579,11 +579,11 @@ public function render($return_output = false)
      *  $pagination->reverse(true);
      *  </code>
      *
-     *  @param  bool     $reverse    (Optional) Set it to TRUE to generate navigation links in reverse order.
+     * @param bool $reverse (Optional) Set it to TRUE to generate navigation links in reverse order.
      *
      *                                  Default is FALSE.
      *
-     *  @return void
+     * @return void
      *
      *  @since  2.0
      */
@@ -601,15 +601,15 @@ public function reverse($reverse = false)
      *  $pagination->selectable_pages(15);
      *  </code>
      *
-     *  @param  int     $selectable_pages   The number of links to be displayed at once (besides the "previous page"
-     *                                          and "next page" links).
+     * @param int $selectable_pages The number of links to be displayed at once (besides the "previous page"
+     *                              and "next page" links).
      *
      *                                          <i>You should set this to an odd number so that the same number of links
      *                                          will be shown to the left and to the right of the current page.</i>
      *
      *                                          Default is 11.
      *
-     *  @return void
+     * @return void
      */
     public function selectable_pages($selectable_pages)
     {
@@ -626,7 +626,7 @@ public function selectable_pages($selectable_pages)
      *  $pagination->set_page(5);
      *  </code>
      *
-     *  @param  int     $page           The page's number.
+     * @param int $page The page's number.
      *
      *                                      A number lower than <b>1</b> will be interpreted as <b>1</b>, while a number
      *                                      greater than the total number of pages will be interpreted as the last page.
@@ -635,7 +635,7 @@ public function selectable_pages($selectable_pages)
      *                                      records (set through {@link records()}) and the number of records that are
      *                                      shown on one page (set through {@link records_per_page()}).
      *
-     *  @return void
+     * @return void
      */
     public function set_page($page)
     {
@@ -663,12 +663,12 @@ public function set_page($page)
      *  $pagination->trailing_slash(false);
      *  </code>
      *
-     *  @param  bool     $enabled    (Optional) Setting this property to FALSE will disable trailing slashes on generated
-     *                                  URLs when {@link method} is "url".
+     * @param bool $enabled (Optional) Setting this property to FALSE will disable trailing slashes on generated
+     *                      URLs when {@link method} is "url".
      *
      *                                  Default is TRUE (trailing slashes are enabled by default).
      *
-     *  @return void
+     * @return void
      */
     public function trailing_slash($enabled)
     {
@@ -686,11 +686,11 @@ public function trailing_slash($enabled)
      *  $pagination->variable_name('foo');
      *  </code>
      *
-     *  @param  string  $variable_name      A string representing the variable name to be used for page propagation.
+     * @param string $variable_name A string representing the variable name to be used for page propagation.
      *
      *                                      Default is "page".
      *
-     *  @return void
+     * @return void
      */
     public function variable_name($variable_name)
     {
@@ -702,7 +702,7 @@ public function variable_name($variable_name)
      *  Generate the link for the page given as argument.
      *
      *
-     *  @return void
+     * @return void
      */
     private function _build_uri($page)
     {
diff --git a/gatherling/models/Series.php b/gatherling/models/Series.php
index 8187787d..cb10ed47 100644
--- a/gatherling/models/Series.php
+++ b/gatherling/models/Series.php
@@ -22,6 +22,7 @@ class Series
     public $prereg_default;
 
     public $discord_guild_id;
+    public $discord_channel_id;
     public $discord_channel_name;
     public $discord_guild_name;
     public $discord_guild_invite;
@@ -46,7 +47,7 @@ public function __construct($name)
         }
 
         $db = Database::getConnection();
-        $sql = 'SELECT isactive, day, normalstart, prereg_default, mtgo_room, discord_guild_id, discord_channel_name, discord_guild_name, discord_guild_invite, discord_require_membership FROM series WHERE name = ?';
+        $sql = 'SELECT isactive, day, normalstart, prereg_default, mtgo_room, discord_guild_id, discord_channel_id, discord_channel_name, discord_guild_name, discord_guild_invite, discord_require_membership FROM series WHERE name = ?';
         $stmt = $db->prepare($sql);
         $stmt or exit($db->error);
         $stmt->bind_param('s', $name);
@@ -58,6 +59,7 @@ public function __construct($name)
             $this->prereg_default,
             $this->mtgo_room,
             $this->discord_guild_id,
+            $this->discord_channel_id,
             $this->discord_channel_name,
             $this->discord_guild_name,
             $this->discord_guild_invite,
diff --git a/gatherling/models/Standings.php b/gatherling/models/Standings.php
index 924401f6..d10e7833 100644
--- a/gatherling/models/Standings.php
+++ b/gatherling/models/Standings.php
@@ -87,6 +87,12 @@ public function save()
         }
     }
 
+    /**
+     * @param string $eventname
+     * @param int    $isactive
+     *
+     * @return Standings[]
+     */
     public static function getEventStandings($eventname, $isactive)
     {
         $db = Database::getConnection();