diff --git a/.gitignore b/.gitignore
index ed5f455797fe2bfed85fc271524d2a5d99fce7fe..982bb3fc969a2a8c6eb80122e72a1f200fef4402 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 bower_components
 config.php
+node_modules
 vendor
diff --git a/COPYRIGHT b/COPYRIGHT
index d0446ed1d797ead559bc319d5c7d279a5b810479..81517e8486c655e2bda4a9cf1e244d3888c9b333 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -12,4 +12,7 @@
     GNU Affero General Public License for more details.
 
     You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
\ No newline at end of file
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+    This product includes GeoLite2 data created by MaxMind, available from
+    <a href="http://www.maxmind.com">http://www.maxmind.com</a>.
diff --git a/Changelog.md b/Changelog.md
index daa688c6ae581942b799ec6381475e31a063fcee..0a1e6e896038023d19eb8def01d0741da4f70528 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,34 @@
+# 2.3.0
+
+## Podmins
+* Can no longer access db/pull.php to test their pod, they can however get to a debug screen from the edit pod area
+* Language is detected based on your homepage, edit your homepage to non-en if that is what you use
+* Edit will send to email on file and be less delay, runner of site does not really have anyway to verify email address
+
+## DB
+* Add development and release dates to masterversions table https://github.com/diasporg/Poduptime/issues/143
+* Store full country name, store days monitored each pod https://github.com/diasporg/Poduptime/issues/150
+* Store detectedlanguage https://github.com/diasporg/Poduptime/issues/144
+* DB migrations see db/version.md
+* rename table rating_comments to ratingcomments for redbean support https://github.com/diasporg/Poduptime/issues/146
+* Default new pods to UP to be checked
+* Remove unused hidden and secure columns https://github.com/diasporg/Poduptime/issues/141 https://github.com/diasporg/Poduptime/issues/140
+
+## Cleanup
+* Use the git API for release versions, check development releases on pods https://github.com/diasporg/Poduptime/issues/143
+* Forbid access to files that should be cli only https://github.com/diasporg/Poduptime/issues/152
+* Move from bower to yarn for packages https://bower.io/blog/2017/how-to-migrate-away-from-bower/
+* Move to PHP 7.2 with declare(strict_types=1);
+* Move to Eslint compliance https://eslint.org/docs/rules/
+* Move to PSR-2 compliance https://www.php-fig.org/psr/psr-2/
+* NOTE config.php.example change to full paths for 2 items!
+
+## End Users
+* Show version and update in full view cleaner https://github.com/diasporg/Poduptime/issues/143
+* Filter and search on the columns of data https://github.com/diasporg/Poduptime/issues/147
+* Paginate the results so they fit per page https://github.com/diasporg/Poduptime/issues/147
+* Show time as human readable everywhere https://github.com/diasporg/Poduptime/issues/150
+
 # 2.2.0
 
 ## Podmins
diff --git a/README.md b/README.md
index 259e5ec84318e072c0d63ab88019807bf557d291..0cfdce639f9ca43254cf1f01838f25846dfa9c39 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,27 @@
 # Poduptime
 
-Poduptime is software to get live stats and data on listed Diaspora Pods.
+Poduptime is software to get live stats and data on listed Diaspora and other Pods that support nodeinfo output.
 
-Dependencies:
+# To Install:
+
+Environmental items you need (debian based system assumed):
+
+OS Dependencies:
 ```
-php7.2 php7.2-curl php7.2-pgsql php-geoip php7.2-cli php7.2-common php7.2-json php7.2-readline php-cgi git curl postgresql postgresql-contrib wget dnsutils bind9 npm nodejs nodejs-legacy composer
+php7.2 php7.2-curl php7.2-pgsql php-geoip php7.2-cli php7.2-common php7.2-bcmath php7.2-json php7.2-readline php7.2-mbstring php7.2-xml php-cgi git curl postgresql postgresql-contrib dnsutils bind9 npm nodejs composer
 ```
+GeoIP needs setup normally with a dat file
+
+Yarn is a separate install: https://yarnpkg.com
 
-To Install:
+
+Clone and setup:
 ```
 git clone https://github.com/diasporg/Poduptime.git
 cd Poduptime
-sudo npm install -g bower
-bower install
+yarn install
 composer install
-cp config.php.example config.php
+cp config.php.example config.php (all fields required)
 ```
 
 If you need to setup your Postgresql/DB:
@@ -28,28 +35,41 @@ sudo -u postgres bash -c "psql -c \"GRANT ALL PRIVILEGES ON DATABASE podupdb TO
 sudo nano /etc/postgresql/vx.x/main/pg_hba.conf
 
 # restart postgresql
+```
 
-# import database structure
+Import database schema
+```
 psql -U podupuser podupdb < db/tables.sql
 ```
 
-Edit `config.php` to add your DB and file settings.
-touch add.log in location you configured in config.php
+1. Edit `config.php` to add your DB and file settings
+2. Touch add.log in location you configured in config.php
+3. Create your backup folder
+4. Add a pod and run `db/pull.sh init` 
 
-run `db/pull.sh` manually or with cron to update your data
-run `db/pull.sh debug` to debug output
-run `db/pull.sh develop` to run without email alerts to end users
-run `db/pull.sh Check_System_Deleted` to re-check system deleted pods as needed
+# To Use:
 
-To Upgrade:
+run `db/pull.sh` manually or with cron to update your data  
+run `db/pull.sh debug` to debug output  
+run `db/pull.sh sqldebug` to debug sql  
+run `db/pull.sh develop` to run without email alerts to end users  
+run `db/pull.sh Check_System_Deleted` to re-check system deleted pods as needed  
+
+# To Upgrade:
 ```
-cd Poduptime
 git pull
-bower install
+yarn install
 composer install
 psql -U podupuser podupdb < db/migrationXXX.sql (see db/version.md for proper migration versions)
 ```
 
+# To Contribute
+
+Something here or a link to the wiki on how to....
+
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/0515afa78df64b6385088246ee84acde)](https://www.codacy.com/app/diasporg/Poduptime?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=diasporg/Poduptime&amp;utm_campaign=Badge_Grade)
+
+
 ============================
 
 Source for Diaspora Pod Uptime
diff --git a/api.php b/api.php
index fa31aac74f9800bc85d49ed9be62d56c1c12dc9d..0baeca5974bbe50b0dcbc114c138c477d3b96682 100644
--- a/api.php
+++ b/api.php
@@ -1,5 +1,10 @@
 <?php
-//Copyright (c) 2011, David Morley. This file is licensed under the Affero General Public License version 3 or later. See the COPYRIGHT file.
+
+/**
+ * API access for pod data.
+ */
+
+declare(strict_types=1);
 
 use RedBeanPHP\R;
 
@@ -21,7 +26,7 @@ R::testConnection() || die('Error in DB connection');
 R::usePartialBeans(true);
 
 if ($_format === 'georss') {
-  echo <<<EOF
+    echo <<<EOF
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom" xmlns:georss="http://www.georss.org/georss">
 <title>Diaspora Pods</title>
@@ -30,26 +35,26 @@ if ($_format === 'georss') {
 
 EOF;
 
-  try {
-    $pods = R::getAll('
-      SELECT name, monthsmonitored, responsetimelast7, uptimelast7, dateupdated, score, domain, country, lat, long
-      FROM pods_apiv1
-    ');
-  } catch (\RedBeanPHP\RedException $e) {
-    die('Error in SQL query: ' . $e->getMessage());
-  }
-
-  foreach ($pods as $pod) {
-    $summary = sprintf(
-      'This pod %1$s has been watched for %2$s months and its average ping time is %3$s with uptime of %4$s%% this month and was last checked on %5$s. On a score of 100 this pod is a %6$s right now',
-      htmlentities($pod['name'], ENT_QUOTES),
-      $pod['monthsmonitored'],
-      $pod['responsetimelast7'],
-      $pod['uptimelast7'],
-      $pod['dateupdated'],
-      $pod['score']
-    );
-    echo <<<EOF
+    try {
+        $pods = R::getAll('
+            SELECT name, monthsmonitored, responsetimelast7, uptimelast7, dateupdated, score, domain, country, lat, long
+            FROM pods_apiv1
+        ');
+    } catch (\RedBeanPHP\RedException $e) {
+        die('Error in SQL query: ' . $e->getMessage());
+    }
+
+    foreach ($pods as $pod) {
+        $summary = sprintf(
+            'This pod %1$s has been watched for %2$s months and its average ping time is %3$s with uptime of %4$s%% this month and was last checked on %5$s. On a score of 100 this pod is a %6$s right now',
+            htmlentities($pod['name'] ?? '', ENT_QUOTES),
+            $pod['monthsmonitored'],
+            $pod['responsetimelast7'],
+            $pod['uptimelast7'],
+            $pod['dateupdated'],
+            $pod['score']
+        );
+        echo <<<EOF
 <entry>
   <title>https://{$pod['domain']}</title>
   <link href="https://{$pod['domain']}"/>
@@ -62,51 +67,50 @@ EOF;
 </entry>
 
 EOF;
-  }
-  echo '</feed>';
+    }
+    echo '</feed>';
 } elseif ($_format === 'json') {
+    try {
+        $pods = R::getAll('
+            SELECT id, domain, status, secure, score, userrating, adminrating, city, state, country, lat, long, ip, ipv6, pingdomurl, monthsmonitored, uptimelast7, responsetimelast7, local_posts, comment_counts, dateCreated, dateUpdated, dateLaststats, hidden
+            FROM pods_apiv1
+        ');
+    } catch (\RedBeanPHP\RedException $e) {
+        die('Error in SQL query: ' . $e->getMessage());
+    }
+
+    //json output, thx Vipul A M for fixing this
+    header('Content-type: application/json');
 
-  try {
-    $pods = R::getAll('
-      SELECT id, domain, status, secure, score, userrating, adminrating, city, state, country, lat, long, ip, ipv6, pingdomurl, monthsmonitored, uptimelast7, responsetimelast7, local_posts, comment_counts, dateCreated, dateUpdated, dateLaststats, hidden
-      FROM pods_apiv1
-    ');
-  } catch (\RedBeanPHP\RedException $e) {
-    die('Error in SQL query: ' . $e->getMessage());
-  }
-
-  //json output, thx Vipul A M for fixing this
-  header('Content-type: application/json');
-
-  $obj = [
-    'podcount' => count($pods),
-    'pods'     => allToString($pods),
-  ];
-  if ($_method === 'jsonp') {
-    print $_callback . '(' . json_encode($obj) . ')';
-  } else {
-    print json_encode($obj);
-  }
+    $obj = [
+        'podcount' => count($pods),
+        'pods'     => allToString($pods),
+    ];
+    if ($_method === 'jsonp') {
+        print $_callback . '(' . json_encode($obj) . ')';
+    } else {
+        print json_encode($obj);
+    }
 } else {
-  try {
-    $pods = R::getAll('
-      SELECT domain, uptimelast7, country
-      FROM pods_apiv1
-    ');
-  } catch (\RedBeanPHP\RedException $e) {
-    die('Error in SQL query: ' . $e->getMessage());
-  }
-
-  $i = 0;
-  foreach ($pods as $pod) {
-    $i++ > 0 && print ',';
-    printf(
-      '%1$s Up %2$s%% This Month - Located in: %3$s',
-      $pod['domain'],
-      $pod['uptimelast7'],
-      $pod['country']
-    );
-  }
+    try {
+        $pods = R::getAll('
+            SELECT domain, uptimelast7, country
+            FROM pods_apiv1
+        ');
+    } catch (\RedBeanPHP\RedException $e) {
+        die('Error in SQL query: ' . $e->getMessage());
+    }
+
+    $i = 0;
+    foreach ($pods as $pod) {
+        $i++ > 0 && print ',';
+        printf(
+            '%1$s Up %2$s%% This Month - Located in: %3$s',
+            $pod['domain'],
+            $pod['uptimelast7'],
+            $pod['country']
+        );
+    }
 }
 
 /**
@@ -121,18 +125,16 @@ EOF;
  */
 function allToString(array $arr)
 {
-  $ret = $arr;
-  foreach ($ret as &$item) {
-    if (is_array($item)) {
-      /** @var array $item */
-      foreach ($item as &$field) {
-        $field !== null && $field = (string) $field;
-      }
-    } else {
-      $item !== null && $item = (string) $item;
+    $ret = $arr;
+    foreach ($ret as &$item) {
+        if (is_array($item)) {
+            $item = allToString($item);
+            continue;
+        }
+
+        $item !== null && $item = (string) $item;
+        unset($item);
     }
-    unset($field, $item);
-  }
 
-  return $ret;
+    return $ret;
 }
diff --git a/bower.json b/bower.json
deleted file mode 100644
index a55577fdafed9d0f213a2505fb6bbe26f2f11da8..0000000000000000000000000000000000000000
--- a/bower.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "name": "poduptime",
-  "homepage": "https://github.com/diasporg/Poduptime",
-  "authors": [
-    "David Morley <support@diasp.org>"
-  ],
-  "description": "Diaspora pod checking site",
-  "main": "",
-  "keywords": [
-    "diaspora"
-  ],
-  "license": "AGPL",
-  "private": true,
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {
-    "bootstrap": "v4.0.0-alpha.6",
-    "jquery-ui": "^1.12.1",
-    "tablesorter": "jquery.tablesorter#^2.28.3",
-    "leaflet": "^1.0.2",
-    "leaflet.markercluster": "^1.0.0",
-    "facebox": "*",
-    "chart.js": "^2.4.0"
-  }
-}
diff --git a/composer.json b/composer.json
index 0d1eced1f43775cb4b58876aa0cd747523b0c7eb..0d176cdfc5bb9d282e336e0d43f1155f3a724386 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,29 @@
 {
+    "config": {
+        "platform": {
+            "php": "7.2"
+        }
+    },
     "require": {
-        "noplanman/xec": "0.1.0",
+        "php": "^7.2",
         "gabordemooij/redbean": "^5.0",
-        "jaybizzle/crawler-detect" :"1.*",
-        "commerceguys/enum": "^1.0"
+        "nesbot/carbon": "^1.31",
+        "commerceguys/enum": "^1.0",
+        "noplanman/xec": "0.1.0",
+        "jaybizzle/crawler-detect": "1.*",
+        "patrickschur/language-detection": "^3.3",
+        "geoip2/geoip2": "^2.9",
+        "maxmind-db/reader": "~1.0"
+    },
+    "require-dev": {
+        "squizlabs/php_codesniffer": "^3.3"
     },
     "autoload": {
         "classmap": ["lib"]
+    },
+    "scripts": {
+        "check-code": [
+            "vendor/bin/phpcs --standard=PSR2 -snp --encoding=utf-8 --report-width=150 lib *.php"
+        ]
     }
 }
diff --git a/composer.lock b/composer.lock
index a2a244dd08888779c68bef18f8f2703c2553fba6..705d152cc27a0d448c1cf5dd6e102f8ebc2e1073 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,10 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "b753491dc03e2084e9587d0bbafad98c",
+    "content-hash": "0817bebabc4fd710e4682f1ebaff3f95",
     "packages": [
         {
             "name": "commerceguys/enum",
@@ -44,6 +44,62 @@
             "description": "A PHP 5.4+ enumeration library.",
             "time": "2015-02-27T21:36:56+00:00"
         },
+        {
+            "name": "composer/ca-bundle",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/ca-bundle.git",
+                "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/d2c0a83b7533d6912e8d516756ebd34f893e9169",
+                "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169",
+                "shasum": ""
+            },
+            "require": {
+                "ext-openssl": "*",
+                "ext-pcre": "*",
+                "php": "^5.3.2 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
+                "psr/log": "^1.0",
+                "symfony/process": "^2.5 || ^3.0 || ^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\CaBundle\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
+            "keywords": [
+                "cabundle",
+                "cacert",
+                "certificate",
+                "ssl",
+                "tls"
+            ],
+            "time": "2018-03-29T19:57:20+00:00"
+        },
         {
             "name": "gabordemooij/redbean",
             "version": "v5.1",
@@ -85,25 +141,77 @@
             ],
             "time": "2018-04-01T11:51:37+00:00"
         },
+        {
+            "name": "geoip2/geoip2",
+            "version": "v2.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/maxmind/GeoIP2-php.git",
+                "reference": "a807fbf65212eef5d8d2db1a1b31082b53633d77"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/maxmind/GeoIP2-php/zipball/a807fbf65212eef5d8d2db1a1b31082b53633d77",
+                "reference": "a807fbf65212eef5d8d2db1a1b31082b53633d77",
+                "shasum": ""
+            },
+            "require": {
+                "maxmind-db/reader": "~1.0",
+                "maxmind/web-service-common": "~0.5",
+                "php": ">=5.4"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "2.*",
+                "phpunit/phpunit": "4.*",
+                "squizlabs/php_codesniffer": "3.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "GeoIp2\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Gregory J. Oschwald",
+                    "email": "goschwald@maxmind.com",
+                    "homepage": "http://www.maxmind.com/"
+                }
+            ],
+            "description": "MaxMind GeoIP2 PHP API",
+            "homepage": "https://github.com/maxmind/GeoIP2-php",
+            "keywords": [
+                "IP",
+                "geoip",
+                "geoip2",
+                "geolocation",
+                "maxmind"
+            ],
+            "time": "2018-04-10T15:32:59+00:00"
+        },
         {
             "name": "jaybizzle/crawler-detect",
-            "version": "v1.2.62",
+            "version": "v1.2.64",
             "source": {
                 "type": "git",
                 "url": "https://github.com/JayBizzle/Crawler-Detect.git",
-                "reference": "f9767578e00f87a081835b49adc7c71074a5b46c"
+                "reference": "f62200a42fdc5ea53c873f38c123a8e6b54ca0de"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/f9767578e00f87a081835b49adc7c71074a5b46c",
-                "reference": "f9767578e00f87a081835b49adc7c71074a5b46c",
+                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/f62200a42fdc5ea53c873f38c123a8e6b54ca0de",
+                "reference": "f62200a42fdc5ea53c873f38c123a8e6b54ca0de",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.8.*",
+                "phpunit/phpunit": "^4.8|^5.5|^6.5",
                 "satooshi/php-coveralls": "1.*"
             },
             "type": "library",
@@ -132,7 +240,164 @@
                 "crawlerdetect",
                 "php crawler detect"
             ],
-            "time": "2018-03-27T18:25:43+00:00"
+            "time": "2018-06-22T20:32:56+00:00"
+        },
+        {
+            "name": "maxmind-db/reader",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git",
+                "reference": "e042b4f8a2dff41e19019faf16427178b07fbd58"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/e042b4f8a2dff41e19019faf16427178b07fbd58",
+                "reference": "e042b4f8a2dff41e19019faf16427178b07fbd58",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "2.*",
+                "phpunit/phpunit": "4.* || 5.*",
+                "satooshi/php-coveralls": "1.0.*",
+                "squizlabs/php_codesniffer": "3.*"
+            },
+            "suggest": {
+                "ext-bcmath": "bcmath or gmp is required for decoding larger integers with the pure PHP decoder",
+                "ext-gmp": "bcmath or gmp is required for decoding larger integers with the pure PHP decoder",
+                "ext-maxminddb": "A C-based database decoder that provides significantly faster lookups"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "MaxMind\\Db\\": "src/MaxMind/Db"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Gregory J. Oschwald",
+                    "email": "goschwald@maxmind.com",
+                    "homepage": "http://www.maxmind.com/"
+                }
+            ],
+            "description": "MaxMind DB Reader API",
+            "homepage": "https://github.com/maxmind/MaxMind-DB-Reader-php",
+            "keywords": [
+                "database",
+                "geoip",
+                "geoip2",
+                "geolocation",
+                "maxmind"
+            ],
+            "time": "2018-02-21T21:23:33+00:00"
+        },
+        {
+            "name": "maxmind/web-service-common",
+            "version": "v0.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/maxmind/web-service-common-php.git",
+                "reference": "61a9836fa3bb1743ab89752bae5005d71e78c73b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/maxmind/web-service-common-php/zipball/61a9836fa3bb1743ab89752bae5005d71e78c73b",
+                "reference": "61a9836fa3bb1743ab89752bae5005d71e78c73b",
+                "shasum": ""
+            },
+            "require": {
+                "composer/ca-bundle": "^1.0.3",
+                "ext-curl": "*",
+                "ext-json": "*",
+                "php": ">=5.4"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "2.*",
+                "phpunit/phpunit": "4.*",
+                "squizlabs/php_codesniffer": "3.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "MaxMind\\Exception\\": "src/Exception",
+                    "MaxMind\\WebService\\": "src/WebService"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Gregory Oschwald",
+                    "email": "goschwald@maxmind.com"
+                }
+            ],
+            "description": "Internal MaxMind Web Service API",
+            "homepage": "https://github.com/maxmind/web-service-common-php",
+            "time": "2018-02-12T22:31:54+00:00"
+        },
+        {
+            "name": "nesbot/carbon",
+            "version": "1.32.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/briannesbitt/Carbon.git",
+                "reference": "64563e2b9f69e4db1b82a60e81efa327a30ff343"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/64563e2b9f69e4db1b82a60e81efa327a30ff343",
+                "reference": "64563e2b9f69e4db1b82a60e81efa327a30ff343",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/translation": "~2.6 || ~3.0 || ~4.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "~2",
+                "phpunit/phpunit": "^4.8.35 || ^5.7"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Carbon\\Laravel\\ServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brian Nesbitt",
+                    "email": "brian@nesbot.com",
+                    "homepage": "http://nesbot.com"
+                }
+            ],
+            "description": "A simple API extension for DateTime.",
+            "homepage": "http://carbon.nesbot.com",
+            "keywords": [
+                "date",
+                "datetime",
+                "time"
+            ],
+            "time": "2018-07-05T06:59:26+00:00"
         },
         {
             "name": "noplanman/xec",
@@ -185,14 +450,245 @@
                 "timeout"
             ],
             "time": "2017-03-12T19:16:23+00:00"
+        },
+        {
+            "name": "patrickschur/language-detection",
+            "version": "v3.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/patrickschur/language-detection.git",
+                "reference": "21a2e7a1b9bf6bff578ac11c6dcf3d3668aeccdf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/patrickschur/language-detection/zipball/21a2e7a1b9bf6bff578ac11c6dcf3d3668aeccdf",
+                "reference": "21a2e7a1b9bf6bff578ac11c6dcf3d3668aeccdf",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": "^7"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "LanguageDetection\\": "src/LanguageDetection"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Patrick Schur",
+                    "email": "patrick_schur@outlook.de"
+                }
+            ],
+            "description": "A language detection library for PHP. Detects the language from a given text string.",
+            "homepage": "https://github.com/patrickschur/language-detection",
+            "keywords": [
+                "detect",
+                "detection",
+                "language"
+            ],
+            "time": "2018-02-01T17:12:47+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "3296adf6a6454a050679cde90f95350ad604b171"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
+                "reference": "3296adf6a6454a050679cde90f95350ad604b171",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2018-04-26T10:06:28+00:00"
+        },
+        {
+            "name": "symfony/translation",
+            "version": "v4.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/translation.git",
+                "reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
+                "reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/config": "<3.4",
+                "symfony/dependency-injection": "<3.4",
+                "symfony/yaml": "<3.4"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~3.4|~4.0",
+                "symfony/console": "~3.4|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/finder": "~2.8|~3.0|~4.0",
+                "symfony/intl": "~3.4|~4.0",
+                "symfony/yaml": "~3.4|~4.0"
+            },
+            "suggest": {
+                "psr/log-implementation": "To use logging capability in translator",
+                "symfony/config": "",
+                "symfony/yaml": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Translation\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Translation Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-06-22T08:59:39+00:00"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "3.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d86873af43b4aa9d1f39a3601cc0cfcf02b25266",
+                "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "bin": [
+                "bin/phpcs",
+                "bin/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "http://www.squizlabs.com/php-codesniffer",
+            "keywords": [
+                "phpcs",
+                "standards"
+            ],
+            "time": "2018-06-06T23:58:19+00:00"
         }
     ],
-    "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": []
+    "platform": {
+        "php": "^7.2"
+    },
+    "platform-dev": [],
+    "platform-overrides": {
+        "php": "7.2"
+    }
 }
diff --git a/config.php.example b/config.php.example
index b65ba244145c017abed1b93cd69687ecf3885625..ea36e923c83f4c20ae832710e6e357fd9d71f997 100644
--- a/config.php.example
+++ b/config.php.example
@@ -1,24 +1,41 @@
 <?php
-/* Copyright (c) 2011, David Morley. This file is licensed under the Affero General Public License version 3 or later. See the COPYRIGHT file. */
-//backup directory
-$backup_dir = '/backup';
-//log directory
-$log_dir = '/log';
-//location of pg dump
+
+/**
+ * Config for Poduptime.
+ */
+
+//backup directory - full dir path
+$backup_dir = __DIR__ . '/backup';
+
+//log directory - full dir path
+$log_dir = __DIR__ . '/log';
+
+//location of pg dump - full dir path
 $pg_dump_dir = '/usr/bin';
+
 //db host
 $pghost = 'localhost';
+
 //db username
 $pguser = '';
+
 //db password
 $pgpass = '';
+
 //db name
 $pgdb = '';
+
 //admin email for forms
 $adminemail = '';
+
 //DNS server for dnssec testing. 1.1.1.1 tests the best
 $dnsserver = '';
-//CA for curl to use - suggest wget http://curl.haxx.se/ca/cacert.pem as they pull from mozilla if you use a system CA then certs like wosign and startssl will be valid but users will be unable to connect to them
+
+//CA for curl to use - full file path (pull.sh will update this monthly)
 $cafullpath = '';
+
 //Mapbox.com API key. https://www.mapbox.com/help/how-access-tokens-work/
 $mapboxkey = '';
+
+//Geolite2-city database file in mmdb format - full file path (pull.sh will update this monthly)
+$geoip2db = '';
diff --git a/css/poduptime.css b/css/poduptime.css
index 510bd0c601c807564a2ed81c542c915d6c4d6ca9..12132cc13082628e9f54f4a17cac3ddaea02b44d 100644
--- a/css/poduptime.css
+++ b/css/poduptime.css
@@ -1,100 +1,221 @@
-body {
-  padding-top: 54px;
-}
-.sub-header {
-  border-bottom: 1px solid #eee;
-  padding-bottom: 10px;
-}
-.sidebar {
-  background-color: #f5f5f5;
-  border-right: 1px solid #eee;
-  bottom: 0;
-  display: block;
-  overflow-x: hidden;
-  overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
-  padding: 10px;
-  position: fixed;
-  top: 54px;
-  z-index: 1000;
-}
-.sidebar .nav {
-  margin-bottom: 20px;
-}
-.sidebar .nav .nav-link {
-  padding: .3em .7em;
-}
 .main {
-  padding: 20px;
+    padding: 20px;
 }
 
 .placeholders {
-  margin-bottom: 30px;
-  text-align: center;
+    margin-bottom: 30px;
+    text-align: center;
 }
+
 .placeholders h4 {
-  margin-bottom: 0;
+    margin-bottom: 0;
 }
+
 .placeholder {
-  margin-bottom: 20px;
+    margin-bottom: 20px;
 }
+
 .placeholder img {
-  border-radius: 50%;
-  display: inline-block;
-}
-.rating {
-font-size:9px;
+    border-radius: 50%;
+    display: inline-block;
 }
+
 .tfont {
-font-size:12px;
+    font-size: 12px;
 }
+
 .smlogo {
-width: 16px;
-height: 16px;
-background: url('/images/smlogo.png') 0 0;
-display: inline-block;
-margin: 0 2px;
+    width: 16px;
+    height: 16px;
+    background: url('/images/smlogo.png') 0 0;
+    display: inline-block;
+    margin: 0;
 }
+
 .smlogo-twitter {
-background-position: 0 -776px;
+    background-position: 0 -776px;
 }
+
 .smlogo-facebook {
-background-position: 0 -824px;
+    background-position: 0 -824px;
 }
+
 .smlogo-tumblr {
-background-position: 0 -792px;
+    background-position: 0 -792px;
 }
+
 .smlogo-wordpress {
-background-position: 0 -656px;
+    background-position: 0 -656px;
 }
+
 .smlogo-xmpp {
-background: none;
+    background: none;
 }
+
 .smlogo-xmpp img {
-vertical-align: unset;
+    vertical-align: unset;
+}
+
+#map {
+    height: 580px;
 }
-#map { height: 580px; }
+
 .mycluster {
-width: 35px;
-height: 35px;
-background-color: blue;
-text-align: left;
-font-size: 17px;
-background: url('/bower_components/leaflet/dist/images/marker-icon-2x.png') repeat-y right bottom;
-background-size: 25px 37px;
+    width: 35px;
+    height: 35px;
+    text-align: left;
+    font-size: 17px;
+    background: url('/node_modules/leaflet/dist/images/marker-icon-2x.png') repeat-y right bottom;
+    background-size: 25px 37px;
 }
+
 .icon {
-color: red;
+    color: red;
+}
+
+.tablesorter-pager .btn-group-sm .btn {
+    font-size: 1.2em; /* make pager arrows more visible */
+}
+
+.tablesorter-filter-row td {
+    background: #eee;
+    line-height: normal;
+    text-align: center; /* center the input */
+    -webkit-transition: line-height 0.1s ease;
+    -moz-transition: line-height 0.1s ease;
+    -o-transition: line-height 0.1s ease;
+    transition: line-height 0.1s ease;
+}
+
+.tablesorter-filter-row .disabled {
+    opacity: 0.5;
+    filter: alpha(opacity=50);
+    cursor: not-allowed;
+}
+
+.tablesorter-filter-row.hideme td {
+    /*** *********************************************** ***/
+    /*** change this padding to modify the thickness     ***/
+    /*** of the closed filter row (height = padding x 2) ***/
+    padding: 1px;
+    /*** *********************************************** ***/
+    margin: 0;
+    line-height: 0;
+    cursor: pointer;
+}
+
+.tablesorter-filter-row.hideme * {
+    height: 1px;
+    min-height: 0;
+    border: 0;
+    padding: 0;
+    margin: 0;
+    /* don't use visibility: hidden because it disables tabbing */
+    opacity: 0;
+    filter: alpha(opacity=0);
 }
-table { 
-empty-cells: show; 
+
+/* filters */
+.tablesorter-filter {
+    width: 98%;
+    height: inherit;
+    margin: 1px;
+    padding: 1px;
+    background-color: #fff;
+    border: 1px solid #bbb;
+    color: #333;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    -webkit-transition: height 0.1s ease;
+    -moz-transition: height 0.1s ease;
+    -o-transition: height 0.1s ease;
+    transition: height 0.1s ease;
+}
+
+.pagination {
+    display: inline-block;
+    color: black;
+    float: left;
+    padding: 2px 8px;
+    margin: 0 4px;
+    text-decoration: none;
+    transition: background-color .3s;
+    border: 1px solid #ddd;
+    cursor: pointer;
 }
-#facebox {
-z-index: 1000 !important;
+
+.pagination.disabled {
+    color: #f0f0f0;
 }
-#facebox .content {
-width: 800px !important;
+
+.pagedisplay {
+    display: inline-block;
+    color: black;
+    float: left;
+    padding: 2px 8px !important;
+    margin: 0 4px;
+    text-decoration: none;
+    transition: background-color .3s;
+    border: 1px solid #ddd;
+    cursor: pointer;
 }
+
 .tablesorter-header {
-background-size: 10px 15px !important;
+    background-size: 10px 15px !important;
+}
+
+.loadingtable {
+    visibility: hidden;
+    width: 100%;
+    height: 100%;
+}
+
+@-webkit-keyframes featherlightLoader {
+    0% {
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+
+    100% {
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}
+
+@keyframes featherlightLoader {
+    0% {
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+
+    100% {
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}
+
+.featherlight-close-icon {
+    font-size: 30px;
+}
+
+.featherlight-loading .featherlight-content {
+    -webkit-animation: featherlightLoader 1s infinite linear;
+    animation: featherlightLoader 1s infinite linear;
+    background: transparent;
+    border: 8px solid #8f8f8f;
+    border-left-color: #fff;
+    border-radius: 80px;
+    width: 80px;
+    height: 80px;
+    min-width: 0;
 }
 
+.featherlight-loading .featherlight-content > * {
+    display: none !important;
+}
+
+.featherlight-loading .featherlight-close,
+.featherlight-loading .featherlight-inner {
+    display: none;
+}
diff --git a/db/add.php b/db/add.php
index ac8c886d55d6bea9f3b9a35409ddcb6b2c64a615..602fc2e9dd8cd45da2e724e9ec6df1328ddcbc87 100644
--- a/db/add.php
+++ b/db/add.php
@@ -1,19 +1,31 @@
-<!-- /* Copyright (c) 2011, David Morley. This file is licensed under the Affero General Public License version 3 or later. See the COPYRIGHT file. */ -->
 <?php
 
+/**
+ * Add a new pod.
+ */
+
+declare(strict_types=1);
+
+use Poduptime\Logging;
 use RedBeanPHP\R;
 
 require_once __DIR__ . '/../vendor/autoload.php';
-require_once __DIR__ . '/../logging.php';
 require_once __DIR__ . '/../config.php';
 
-define('PODUPTIME', microtime(true));
+if (PHP_SAPI === 'cli' || PHP_SAPI === 'cgi-fcgi') {
+    define('PODUPTIME', microtime(true));
+
+    // Set up global DB connection.
+    R::setup("pgsql:host={$pghost};dbname={$pgdb}", $pguser, $pgpass, true);
+    R::testConnection() || die('Error in DB connection');
+    R::usePartialBeans(true);
+}
 
 $log = new Logging();
-$log->lfile(__DIR__ . '/../' . $log_dir . '/add.log');
+$log->lfile($log_dir . '/add.log');
 if (!($_domain = $_GET['domain'] ?? null)) {
-  $log->lwrite('no domain given');
-  die('no pod domain given');
+    $log->lwrite('no domain given');
+    die('no pod domain given');
 }
 
 // Other parameters.
@@ -23,48 +35,48 @@ $_podmin_notify    = $_GET['podmin_notify'] ?? 0;
 
 $_domain = strtolower($_domain);
 if (!filter_var(gethostbyname($_domain), FILTER_VALIDATE_IP)) {
-  die('Could not validate the domain name, be sure to enter it as "domain.com" (no caps, no slashes, no extras)');
+    die('Could not validate the domain name, be sure to enter it as "domain.com" (no caps, no slashes, no extras)');
 }
 
-// Set up global DB connection.
-R::setup("pgsql:host={$pghost};dbname={$pgdb}", $pguser, $pgpass, true);
-R::testConnection() || die('Error in DB connection');
-R::usePartialBeans(true);
-
 try {
-  $pods = R::getAll('
+    $pods = R::getAll('
     SELECT id, domain, publickey, email
     FROM pods
   ');
 } catch (\RedBeanPHP\RedException $e) {
-  die('Error in SQL query: ' . $e->getMessage());
+    die('Error in SQL query: ' . $e->getMessage());
 }
 
 foreach ($pods as $pod) {
-  if ($pod['domain'] === $_domain) {
-    if ($pod['email']) {
-      $log->lwrite('domain already exists and is registered to an owner' . $_domain);
-      die('domain already exists and is registered to an owner, use the edit function to modify');
-    }
-
-    $digtxt = exec(escapeshellcmd('dig ' . $_domain . ' TXT +short'));
-    if (strpos($digtxt, $pod['publickey']) !== false) {
-      echo 'domain validated, you can now add details ';
-      $uuid   = md5(uniqid($_domain, true));
-      $expire = time() + 2700;
-
-      try {
-        $p                = R::load('pods', $pod['id']);
-        $p['token']       = $uuid;
-        $p['tokenexpire'] = date('Y-m-d H:i:s', $expire);
-
-        R::store($p);
-      } catch (\RedBeanPHP\RedException $e) {
-        die('Error in SQL query: ' . $e->getMessage());
-      }
-
-      echo <<<EOF
-      <form action="edit.php" method="get">
+    if ($pod['domain'] === $_domain) {
+        if ($pod['email']) {
+            $log->lwrite('domain already exists and is registered to an owner' . $_domain);
+            die('domain already exists and is registered to an owner, use the edit function to modify');
+        }
+
+        $digtxt = exec(escapeshellcmd('dig ' . $_domain . ' TXT +short'));
+        if (strpos($digtxt, $pod['publickey']) === false) {
+            $log->lwrite('domain already exists and can be registered' . $_domain);
+            die('domain already exists, you can claim the domain by adding a DNS TXT record that states<br><b> ' . $_domain . ' IN TXT "' . $pod['publickey'] . '"</b>');
+        }
+
+        echo 'domain validated, you can now add details ';
+        $uuid   = md5(uniqid($_domain, true));
+        $expire = time() + 2700;
+
+        try {
+            $p                = R::load('pods', $pod['id']);
+            $p['token']       = $uuid;
+            $p['tokenexpire'] = date('Y-m-d H:i:s', $expire);
+
+            R::store($p);
+        } catch (\RedBeanPHP\RedException $e) {
+            die('Error in SQL query: ' . $e->getMessage());
+        }
+
+        echo <<<EOF
+      <form method="get">
+      <input type="hidden" name="edit">
       <input type="hidden" name="domain" value="{$_domain}">
       <input type="hidden" name="token" value="{$uuid}">
       <label>Email <input type="text" size="20" name="email"></label><br>
@@ -74,16 +86,18 @@ foreach ($pods as $pod) {
       </form>
 EOF;
 
-      die;
-    } else {
-      $log->lwrite('domain already exists and can be registered' . $_domain);
-      die('domain already exists, you can claim the domain by adding a DNS TXT record that states<br><b> ' . $_domain . ' IN TXT "' . $pod['publickey'] . '"</b>');
+        die;
     }
-  }
+}
+
+$link = 'https://' . $_domain . '/nodeinfo/1.0';
+if ($infos = file_get_contents('https://' . $_domain . '/.well-known/nodeinfo')) {
+    $info = json_decode($infos, true);
+    $link = max($info['links'])['href'];
 }
 
 $chss = curl_init();
-curl_setopt($chss, CURLOPT_URL, 'https://' . $_domain . '/nodeinfo/1.0');
+curl_setopt($chss, CURLOPT_URL, $link);
 curl_setopt($chss, CURLOPT_POST, 0);
 curl_setopt($chss, CURLOPT_HEADER, 0);
 curl_setopt($chss, CURLOPT_CONNECTTIMEOUT, 5);
@@ -92,45 +106,43 @@ curl_setopt($chss, CURLOPT_NOBODY, 0);
 $outputssl = curl_exec($chss);
 curl_close($chss);
 
-if (stristr($outputssl, 'openRegistrations')) {
-  $log->lwrite('Your pod has ssl and is valid ' . $_domain);
-  echo 'Your pod has ssl and is valid<br>';
+if ($outputssl && stripos($outputssl, 'openRegistrations') !== false) {
+    $log->lwrite('Your pod has ssl and is valid ' . $_domain);
+    echo 'Your pod has ssl and is valid<br>';
 
-  $publickey = md5(uniqid($_domain, true));
+    $publickey = md5(uniqid($_domain, true));
 
-  try {
-    $p                     = R::dispense('pods');
-    $p['domain']           = $_domain;
-    $p['email']            = $_email;
-    $p['podmin_statement'] = $_podmin_statement;
-    $p['podmin_notify']    = $_podmin_notify;
-    $p['publickey']        = $publickey;
+    try {
+        $p                     = R::dispense('pods');
+        $p['domain']           = $_domain;
+        $p['email']            = $_email;
+        $p['podmin_statement'] = $_podmin_statement;
+        $p['podmin_notify']    = $_podmin_notify;
+        $p['publickey']        = $publickey;
 
-    R::store($p);
-  } catch (\RedBeanPHP\RedException $e) {
-    die('Error in SQL query: ' . $e->getMessage());
-  }
+        R::store($p);
+    } catch (\RedBeanPHP\RedException $e) {
+        die('Error in SQL query: ' . $e->getMessage());
+    }
 
-  if ($_email) {
-    $to      = $adminemail;
-    $subject = 'New pod added to ' . $_SERVER['HTTP_HOST'];
-    $headers = ['From: ' . $_email, 'Reply-To: ' . $_email, 'Cc: ' . $_email];
+    if ($_email) {
+        $to      = $adminemail;
+        $subject = 'New pod added to ' . $_SERVER['HTTP_HOST'];
+        $headers = ['From: ' . $_email, 'Reply-To: ' . $_email, 'Cc: ' . $_email];
 
-    $message_lines = [
-      'https://' . $_SERVER['HTTP_HOST'],
-      'Pod: https://' . $_SERVER['HTTP_HOST'] . '/db/pull.php?debug=1&domain=' . $_domain,
-      '',
-      'Your pod will not show up right away, as it needs to pass a few checks first.',
-      'Give it a few hours!',
-    ];
+        $message_lines = [
+            'https://' . $_SERVER['HTTP_HOST'],
+            'Your pod ' . $_domain . ' will not show up right away, as it needs to pass a few checks first.',
+            'Give it a few hours!',
+        ];
 
-    @mail($to, $subject, implode("\r\n", $message_lines), implode("\r\n", $headers));
-  }
+        @mail($to, $subject, implode("\r\n", $message_lines), implode("\r\n", $headers));
+    }
 
-  echo 'Data successfully inserted! Your pod will be reviewed and live on the list in a few hours!';
+    echo 'Data successfully inserted! Your pod will be checked and live on the list in a few hours!';
 
 } else {
-  $log->lwrite('Could not validate your pod, check your setup! ' . $_domain);
-  echo 'Could not validate your pod, check your setup!<br>Take a look at <a href="https://' . $_domain . '/nodeinfo/1.0">your /nodeinfo</a>';
+    $log->lwrite('Could not validate your pod, check your setup! ' . $_domain);
+    echo 'Could not validate your pod, check your setup!<br>Take a look at <a href="' . $link . '">your /nodeinfo</a>';
 }
 $log->lclose();
diff --git a/db/api-more.php b/db/api-more.php
index 9f79012380be485a02eb39968745161090692a9f..b76d5bf494dff7caeee376cb635f6a9ab0505976 100644
--- a/db/api-more.php
+++ b/db/api-more.php
@@ -1,7 +1,12 @@
 <?php
-//Copyright (c) 2011, David Morley. This file is licensed under the Affero General Public License version 3 or later. See the COPYRIGHT file.
-//this is just a single api for a pod for the android app to get data
 
+/**
+ * This is just a single API for a pod for the Android app to get data.
+ */
+
+declare(strict_types=1);
+
+use Poduptime\PodStatus;
 use RedBeanPHP\R;
 
 // Required parameters.
@@ -21,30 +26,30 @@ R::testConnection() || die('Error in DB connection');
 R::usePartialBeans(true);
 
 try {
-  $pod = R::getRow('
-    SELECT hgitdate, id, domain, status, secure, score, userrating, adminrating, city, state, country, lat, long, ip, ipv6, pingdomurl, monthsmonitored, uptimelast7, responsetimelast7, local_posts, comment_counts, dateCreated, dateUpdated, dateLaststats, hidden
-    FROM pods_apiv1
-    WHERE domain = ?
-  ', [$_domain]);
+    $pod = R::getRow('
+        SELECT hgitdate, id, domain, status, secure, score, userrating, adminrating, city, state, country, lat, long, ip, ipv6, pingdomurl, monthsmonitored, uptimelast7, responsetimelast7, local_posts, comment_counts, dateCreated, dateUpdated, dateLaststats, hidden
+        FROM pods_apiv1
+        WHERE domain = ?
+    ', [$_domain]);
 } catch (\RedBeanPHP\RedException $e) {
-  die('Error in SQL query: ' . $e->getMessage());
+    die('Error in SQL query: ' . $e->getMessage());
 }
 
 if ($_format === 'json') {
-  echo json_encode($pod);
+    echo json_encode($pod);
 } else {
-  if ($pod['status'] === PodStatus::Up) {
-    echo 'Status: Up<br>';
-  }
-  if ($pod['status'] === PodStatus::Down) {
-    echo 'Status: Down<br>';
-  }
-  echo 'Last Git Pull: ' . $pod['hgitdate'] . '<br>';
-  echo 'Uptime This Month ' . $pod['uptimelast7'] . '<br>';
-  echo 'Months Monitored: ' . $pod['monthsmonitored'] . '<br>';
-  echo 'Response Time: ' . $pod['responsetimelast7'] . '<br>';
-  echo 'User Rating: ' . $pod['userrating'] . '<br>';
-  echo 'Server Location: ' . $pod['country'] . '<br>';
-  echo 'Latitude: ' . $pod['lat'] . '<br>';
-  echo 'Longitude: ' . $pod['long'] . '<br>';
+    if ($pod['status'] === PodStatus::UP) {
+        echo 'Status: Up<br>';
+    }
+    if ($pod['status'] === PodStatus::DOWN) {
+        echo 'Status: Down<br>';
+    }
+    echo 'Last Git Pull: ' . $pod['hgitdate'] . '<br>';
+    echo 'Uptime This Month ' . $pod['uptimelast7'] . '<br>';
+    echo 'Months Monitored: ' . $pod['monthsmonitored'] . '<br>';
+    echo 'Response Time: ' . $pod['responsetimelast7'] . '<br>';
+    echo 'User Rating: ' . $pod['userrating'] . '<br>';
+    echo 'Server Location: ' . $pod['country'] . '<br>';
+    echo 'Latitude: ' . $pod['lat'] . '<br>';
+    echo 'Longitude: ' . $pod['long'] . '<br>';
 }
diff --git a/db/backup.php b/db/backup.php
index 606025b24dd8ae12736ac9fd2bcee5c15ad9d772..cacdf7b7c0655235d6d2affb785962695a9627a8 100644
--- a/db/backup.php
+++ b/db/backup.php
@@ -1,18 +1,30 @@
 <?php
+
+/**
+ * Backup / dump PostgreSQL database.
+ */
+
+declare(strict_types=1);
+
+if (PHP_SAPI !== 'cli') {
+    header('HTTP/1.0 403 Forbidden');
+    exit;
+}
+
 require_once __DIR__ . '/../config.php';
 
 $keep      = (60 * 60 * 6) * 1;
 $dump_date = date('Ymd_Hs');
-$file_name = __DIR__ . '/..' .$backup_dir . '/dump_' . $dump_date . '.sql';
+$file_name = $backup_dir . '/dump_' . $dump_date . '.sql';
 system("export PGPASSWORD=$pgpass && $pg_dump_dir/pg_dump --username=$pguser $pgdb >> $file_name");
 echo "pg backup of $pgdb made";
-$dirh = dir(__DIR__ . '/..' .$backup_dir);
+$dirh = dir($backup_dir);
 while ($entry = $dirh->read()) {
-  $old_file_time = (date('U') - $keep);
-  $file_created  = filectime(__DIR__ . '/..' . "$backup_dir/$entry");
-  if ($file_created < $old_file_time && !is_dir($entry)) {
-    if (unlink(__DIR__ . '/..' . "$backup_dir/$entry")) {
-      echo 'Cleaned up old backups';
+    $old_file_time = (date('U') - $keep);
+    $file_created  = filectime("$backup_dir/$entry");
+    if ($file_created < $old_file_time && !is_dir($entry)) {
+        if (unlink("$backup_dir/$entry")) {
+            echo 'Cleaned up old backups';
+        }
     }
-  }
 }
diff --git a/db/edit.php b/db/edit.php
index e305c73e8fdb720b3a0d2bf44a180150e25cdf18..bf827e108fd33f0f3c6856e5656f8db9df0cf6e9 100644
--- a/db/edit.php
+++ b/db/edit.php
@@ -1,7 +1,14 @@
 <?php
 
+/**
+ * Edit an existing pod.
+ */
+
+declare(strict_types=1);
+
+use Carbon\Carbon;
+use Poduptime\PodStatus;
 use RedBeanPHP\R;
-use CommerceGuys\Enum\AbstractEnum;
 
 // Required parameters.
 ($_domain = $_GET['domain'] ?? null) || die('no pod domain given');
@@ -19,10 +26,10 @@ require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../config.php';
 
 try {
-  $pod = R::findOne('pods', 'domain = ?', [$_domain]);
-  $pod || die('domain not found');
+    $pod = R::findOne('pods', 'domain = ?', [$_domain]);
+    $pod || die('domain not found');
 } catch (\RedBeanPHP\RedException $e) {
-  die('Error in SQL query: ' . $e->getMessage());
+    die('Error in SQL query: ' . $e->getMessage());
 }
 
 $pod['token'] === $_token || die('token mismatch');
@@ -30,94 +37,94 @@ $pod['tokenexpire'] >= date('Y-m-d H:i:s') || die('token expired');
 
 // Delete and exit.
 if ('delete' === $_action) {
-  try {
-    $pod['status'] = PodStatus::User_Deleted;
-    R::store($pod);
-  } catch (\RedBeanPHP\RedException $e) {
-    die('Error in SQL query: ' . $e->getMessage());
-  }
-  die('pod deleted');
+    try {
+        $pod['status'] = PodStatus::USER_DELETED;
+        R::store($pod);
+    } catch (\RedBeanPHP\RedException $e) {
+        die('Error in SQL query: ' . $e->getMessage());
+    }
+    die('pod deleted');
 }
 
 // Pause and exit.
 if ('pause' === $_action) {
-  try {
-    $pod['status'] = PodStatus::Paused;
-    R::store($pod);
-  } catch (\RedBeanPHP\RedException $e) {
-    die('Error in SQL query: ' . $e->getMessage());
-  }
-  die('pod paused');
+    try {
+        $pod['status'] = PodStatus::PAUSED;
+        R::store($pod);
+    } catch (\RedBeanPHP\RedException $e) {
+        die('Error in SQL query: ' . $e->getMessage());
+    }
+    die('pod paused');
 }
 
 // Un-Pause and exit.
 if ('unpause' === $_action) {
-  try {
-    $pod['status'] = PodStatus::Recheck;
-    R::store($pod);
-  } catch (\RedBeanPHP\RedException $e) {
-    die('Error in SQL query: ' . $e->getMessage());
-  }
-  die('pod unpaused');
+    try {
+        $pod['status'] = PodStatus::Recheck;
+        R::store($pod);
+    } catch (\RedBeanPHP\RedException $e) {
+        die('Error in SQL query: ' . $e->getMessage());
+    }
+    die('pod unpaused');
 }
 
 // Save and exit.
 if ('save' === $_action) {
-  $_weight <= 10 || die('10 is max weight');
-
-  try {
-    $pod['email']            = $_email;
-    $pod['weight']           = $_weight;
-    $pod['podmin_statement'] = $_podmin_statement;
-    $pod['podmin_notify']    = $_podmin_notify;
-
-    R::store($pod);
-  } catch (\RedBeanPHP\RedException $e) {
-    die('Error in SQL query: ' . $e->getMessage());
-  }
-
-  $to      = $_email;
-  $headers = ['From: ' . $adminemail, 'Cc: ' . $pod['email'], 'Bcc: ' . $adminemail];
-  $subject = 'Edit notice from poduptime';
-  $message = 'Data for ' . $_domain . ' updated. If it was not you reply and let me know!';
-  @mail($to, $subject, $message, implode("\r\n", $headers));
-
-  die('Data saved. Will go into effect on next hourly change');
+    $_weight <= 10 || die('10 is max weight');
+
+    try {
+        $pod['email']            = $_email;
+        $pod['weight']           = $_weight;
+        $pod['podmin_statement'] = $_podmin_statement;
+        $pod['podmin_notify']    = $_podmin_notify;
+
+        R::store($pod);
+    } catch (\RedBeanPHP\RedException $e) {
+        die('Error in SQL query: ' . $e->getMessage());
+    }
+
+    $to      = $_email;
+    $headers = ['From: ' . $adminemail, 'Cc: ' . $pod['email'], 'Bcc: ' . $adminemail];
+    $subject = 'Edit notice from poduptime';
+    $message = 'Data for ' . $_domain . ' updated. If it was not you reply and let me know!';
+    @mail($to, $subject, $message, implode("\r\n", $headers));
+
+    die('Data saved. Will go into effect on next hourly change');
 }
 
 // Forms.
 
 ?>
-  Authorized to edit <b><?php echo $_domain; ?></b> until <?php echo $pod['tokenexpire']; ?><br>
-  <form>
+Authorized to edit <b><?php echo $_domain; ?></b> for <?php echo (new Carbon($pod['tokenexpire']))->diffForHumans(null, true); ?><br>
+<form>
     <input type="hidden" name="edit">
     <input type="hidden" name="domain" value="<?php echo $_domain; ?>">
     <input type="hidden" name="token" value="<?php echo $_token; ?>">
     <label>Email <input type="text" size="40" name="email" value="<?php echo $pod['email']; ?>"></label><br>
     <label>Podmin Statement (You can use HTML to include links to your terms and policies and information about your pod you wish to share with users.) <br><textarea cols="150" rows="10" name="podmin_statement"><?php echo $pod['podmin_statement']; ?></textarea></label><br>
     <label>Weight <input type="text" size="2" name="weight" value="<?php echo $pod['weight']; ?>"> This lets you weight your pod lower on the list if you have too much traffic coming in, 10 is the norm use lower to move down the list.</label><br>
-    <label>Notify if pod falls to hidden status? <input type="checkbox" name="podmin_notify" <?php echo $pod['podmin_notify'] ? 'checked' : ''; ?> ></label><br>
+    <label>Notify if pod falls off the list? <input type="checkbox" name="podmin_notify" <?php echo $pod['podmin_notify'] ? 'checked' : ''; ?> ></label><br>
     <input type="submit" name="action" value="save">
-  </form>
-  <br>
-  <br>Your pod status is currently: <?php echo PodStatus::getKey((int)$pod['status']); ?>
-  <br>
-  <form>
+</form>
+<br>
+<br>Your pod status is currently: <?php echo PodStatus::getKey((int) $pod['status']); ?>
+<br>
+<form>
     <input type="hidden" name="edit">
     <input type="hidden" name="domain" value="<?php echo $_domain; ?>">
     <input type="hidden" name="token" value="<?php echo $_token; ?>">
     <input type="submit" name="action" value="delete">
-  </form>
-  <form>
+</form>
+<form>
     <input type="hidden" name="edit">
     <input type="hidden" name="domain" value="<?php echo $_domain; ?>">
     <input type="hidden" name="token" value="<?php echo $_token; ?>">
     <input type="submit" name="action" value="pause">
-  </form>
-  <form>
+</form>
+<form>
     <input type="hidden" name="edit">
     <input type="hidden" name="domain" value="<?php echo $_domain; ?>">
     <input type="hidden" name="token" value="<?php echo $_token; ?>">
     <input type="submit" name="action" value="unpause">
-  </form>
-<?php
+</form>
+<button type="button" data-featherlight="/db/pull.php?debug=1&nowrite=1&domain=<?php echo $_domain; ?>">Do a debug test pull of your pod</button>
diff --git a/db/gettoken.php b/db/gettoken.php
index 174215ec66646652e6277a8ec2be7f506faf9d7c..4aaec3da9206f00c93b78c1a4be1c5a966cff07c 100644
--- a/db/gettoken.php
+++ b/db/gettoken.php
@@ -1,28 +1,27 @@
 <?php
 
+/**
+ * Get token to allow pod editing.
+ */
+
+declare(strict_types=1);
+
 use RedBeanPHP\R;
 
 // Required parameters.
-($_domain = $_POST['domain'] ?? null) || die('no pod domain given');
+($_domain = $_GET['domain'] ?? null) || die('no pod domain given');
 
 // Other parameters.
-$_email = $_POST['email'] ?? '';
+$_email = $_GET['email'] ?? '';
 
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../config.php';
 
-define('PODUPTIME', microtime(true));
-
-// Set up global DB connection.
-R::setup("pgsql:host={$pghost};dbname={$pgdb}", $pguser, $pgpass, true);
-R::testConnection() || die('Error in DB connection');
-R::usePartialBeans(true);
-
 try {
-  $pod = R::findOne('pods', 'domain = ?', [$_domain]);
-  $pod || die('domain not found');
+    $pod = R::findOne('pods', 'domain = ?', [$_domain]);
+    $pod || die('domain not found');
 } catch (\RedBeanPHP\RedException $e) {
-  die('Error in SQL query: ' . $e->getMessage());
+    die('Error in SQL query: ' . $e->getMessage());
 }
 
 // Set up common variables.
@@ -32,31 +31,31 @@ $headers       = ['From: ' . $adminemail];
 $message_lines = [];
 
 if ($_email) {
-  $pod['email'] === $_email || die('email mismatch');
+    $pod['email'] === $_email || die('email mismatch');
 
-  $to        = $_email;
-  $subject   = 'Temporary edit key for ' . $_SERVER['HTTP_HOST'];
-  $headers[] = 'Bcc: ' . $adminemail;
-  $expire    = time() + 2700;
-  $output    = 'Link sent to your email';
+    $to        = $_email;
+    $subject   = 'Temporary edit key for ' . $_SERVER['HTTP_HOST'];
+    $headers[] = 'Bcc: ' . $adminemail;
+    $expire    = time() + 2700;
+    $output    = 'Link sent to your email.';
 } elseif (!$pod['email']) {
-  die('domain is registered but no email associated, to add an email use the add a pod feature');
+    die('Domain is registered but no email associated, to add an email use the add a pod feature.');
 } else {
-  $to              = $adminemail;
-  $subject         = 'FORWARD REQUEST: Temporary edit key for ' . $_SERVER['HTTP_HOST'];
-  $message_lines[] = 'User trying to edit pod without email address.';
-  $message_lines[] = 'Email found: ' . $pod['email'];
-  $expire          = time() + 9700;
-  $output          = 'Link sent to administrator to review and verify, if approved they will forward the edit key to you.';
+    $to              = $pod['email'];
+    $subject         = 'Temporary edit key for ' . $_SERVER['HTTP_HOST'];
+    $message_lines[] = 'Looks like you did not enter your email address, be sure to update it if you forgot the one we have for you.';
+    $message_lines[] = 'Email found: ' . $pod['email'];
+    $expire          = time() + 2700;
+    $output          = 'Link sent to email we have for this pod on file.';
 }
 
 try {
-  $pod['token']       = $uuid;
-  $pod['tokenexpire'] = date('Y-m-d H:i:s', $expire);
+    $pod['token']       = $uuid;
+    $pod['tokenexpire'] = date('Y-m-d H:i:s', $expire);
 
-  R::store($pod);
+    R::store($pod);
 } catch (\RedBeanPHP\RedException $e) {
-  die('Error in SQL query: ' . $e->getMessage());
+    die('Error in SQL query: ' . $e->getMessage());
 }
 
 $message_lines[] = 'Link: ' . $link;
diff --git a/db/migration00005.sql b/db/migration00005.sql
new file mode 100644
index 0000000000000000000000000000000000000000..1317d6cf3092c9a141baaf35e7e7abc387aa8f08
--- /dev/null
+++ b/db/migration00005.sql
@@ -0,0 +1,8 @@
+ALTER TABLE masterversions ADD devlastcommit timestamp, ADD releasedate timestamp;
+ALTER TABLE pods ADD daysmonitored int, ADD countryname text, ADD detectedlanguage text;
+ALTER TABLE pods DROP COLUMN adminrating, DROP COLUMN hidden, DROP COLUMN secure;
+UPDATE pods SET status=1 WHERE status IS NULL;
+ALTER TABLE pods ALTER status SET DEFAULT 1;
+ALTER TABLE rating_comments DROP COLUMN admin;
+ALTER TABLE rating_comments RENAME TO ratingcomments;
+ALTER TABLE checks ADD version text;
diff --git a/db/monthly_stats.php b/db/monthly_stats.php
index 184db5a76bd53eb1f0521da0e89f2ebf2a8657ad..0952acce561f5c6fed2fd8d1ebdf111275927218 100644
--- a/db/monthly_stats.php
+++ b/db/monthly_stats.php
@@ -1,5 +1,16 @@
 <?php
 
+/**
+ * Compute monthly stats.
+ */
+
+declare(strict_types=1);
+
+if (PHP_SAPI !== 'cli') {
+    header('HTTP/1.0 403 Forbidden');
+    exit;
+}
+
 use RedBeanPHP\R;
 
 require_once __DIR__ . '/../vendor/autoload.php';
@@ -13,41 +24,41 @@ R::testConnection() || die('Error in DB connection');
 R::usePartialBeans(true);
 
 try {
-  $monthly_totals = R::getAll("
-    SELECT
-      to_char(date_checked, 'yyyy-mm') AS yymm,
-      sum(total_users) / count(DISTINCT to_char(date_checked, 'HH24 dd')) as users,
-      sum(local_posts) / count(DISTINCT to_char(date_checked, 'HH24 dd')) as posts,
-      sum(comment_counts) / count(DISTINCT to_char(date_checked, 'HH24 dd')) as comments,
-      count(domain) / count(DISTINCT to_char(date_checked, 'HH24 dd')) as pods,
-      count(nullif(online, false)) as uptime, 
-      count(nullif(online, true)) as downtime
-    FROM checks
-    GROUP BY yymm
-  ");
+    $monthly_totals = R::getAll("
+        SELECT
+            to_char(date_checked, 'yyyy-mm') AS yymm,
+            sum(total_users) / count(DISTINCT to_char(date_checked, 'HH24 dd')) as users,
+            sum(local_posts) / count(DISTINCT to_char(date_checked, 'HH24 dd')) as posts,
+            sum(comment_counts) / count(DISTINCT to_char(date_checked, 'HH24 dd')) as comments,
+            count(domain) / count(DISTINCT to_char(date_checked, 'HH24 dd')) as pods,
+            count(nullif(online, false)) as uptime, 
+            count(nullif(online, true)) as downtime
+        FROM checks
+        GROUP BY yymm
+    ");
 } catch (\RedBeanPHP\RedException $e) {
-  die('Error in SQL query: ' . $e->getMessage());
+    die('Error in SQL query: ' . $e->getMessage());
 }
 foreach ($monthly_totals as $monthly) {
 
-  // Format date to timestamp.
-  $timestamp = $monthly['yymm'].'-01 01:01:01-01';
+    // Format date to timestamp.
+    $timestamp = $monthly['yymm'] . '-01 01:01:01-01';
 
-  try {
-    $p = R::findOrCreate('monthlystats', ['date_checked' => $timestamp]);
+    try {
+        $p = R::findOrCreate('monthlystats', ['date_checked' => $timestamp]);
 
-    $p['total_users']    = $monthly['users'];
-    $p['total_posts']    = $monthly['posts'];
-    $p['total_comments'] = $monthly['comments'];
-    $p['total_pods']     = $monthly['pods'];
-    if ($monthly['downtime']) {
-      $p['total_uptime'] = round($monthly['downtime'] / $monthly['uptime'] * 100);
-    } else {
-      $p['total_uptime'] = 100;
-    }
+        $p['total_users']    = $monthly['users'];
+        $p['total_posts']    = $monthly['posts'];
+        $p['total_comments'] = $monthly['comments'];
+        $p['total_pods']     = $monthly['pods'];
+        if ($monthly['downtime']) {
+            $p['total_uptime'] = round($monthly['downtime'] / $monthly['uptime'] * 100);
+        } else {
+            $p['total_uptime'] = 100;
+        }
 
-    R::store($p);
-  } catch (\RedBeanPHP\RedException $e) {
-    die('Error in SQL query: ' . $e->getMessage());
-  }
+        R::store($p);
+    } catch (\RedBeanPHP\RedException $e) {
+        die('Error in SQL query: ' . $e->getMessage());
+    }
 }
diff --git a/db/podcrawler.php b/db/podcrawler.php
index 4c3320a704a4daf6cd3e6e819910a80f8ee11e03..a9e0bc0a826223bda1390c0ae1fa22860ce6ecad 100644
--- a/db/podcrawler.php
+++ b/db/podcrawler.php
@@ -1,12 +1,63 @@
 <?php
 
-if (php_sapi_name() == "cli") {
-  $json = json_decode(file_get_contents('https://the-federation.info/pods.json'));
-  if ($json) {
-    foreach ($json->pods ?? [] as $poddata) {
-      echo exec("php-cgi add.php domain={$poddata->host}") . "\r\n";
+/**
+ * Crawl and add all pods from the-federation.info list.
+ */
+
+declare(strict_types=1);
+
+if (PHP_SAPI !== 'cli') {
+    header('HTTP/1.0 403 Forbidden');
+    exit;
+}
+
+use RedBeanPHP\R;
+
+require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__ . '/../config.php';
+
+define('PODUPTIME', microtime(true));
+
+// Set up global DB connection.
+R::setup("pgsql:host={$pghost};dbname={$pgdb}", $pguser, $pgpass, true);
+R::testConnection() || die('Error in DB connection');
+R::usePartialBeans(true);
+
+try {
+    $sql  = '
+        SELECT domain, status
+        FROM pods
+    ';
+    $pods = R::getAll($sql);
+} catch (\RedBeanPHP\RedException $e) {
+    die('Error in SQL query: ' . $e->getMessage());
+}
+
+//get all existing pod domains
+$existingpods = array_column($pods, 'domain');
+
+$foundpods = [];
+
+//pulling all nodes for now
+if ($pods = json_decode(file_get_contents('https://the-federation.info/graphql?query=%7Bnodes%7Bhost%20platform%7Bname%7Dprotocols%7Bname%7D%7D%7D&raw'), true)) {
+    foreach ($pods['data']['nodes'] ?? [] as $poddata) {
+        $protocols = array_column($poddata['protocols'] ?? [], 'name');
+
+        //limiting to diaspora compatible for now
+        if (in_array('diaspora', $protocols, true)) {
+            $foundpods[] = $poddata['host'];
+        }
     }
-  }
-} else {
-header('HTTP/1.0 403 Forbidden');
+}
+
+if ($pods = json_decode(file_get_contents('https://diasp.org/pods.json'), true)) {
+    foreach ($pods ?? [] as $poddata) {
+        $foundpods[] = $poddata['host'];
+    }
+}
+
+$results = array_diff($foundpods, $existingpods);
+foreach ($results as $result) {
+    echo $result . ' ';
+    echo exec("php-cgi add.php domain={$result}") . "\r\n";
 }
diff --git a/db/pods_apiv1.sql b/db/pods_apiv1.sql
index 457e7db5fdcb2e78a88430d080cfbcbde7e995fa..12c9fc759ee1337037a6efd398ba970a0a7f2f47 100644
--- a/db/pods_apiv1.sql
+++ b/db/pods_apiv1.sql
@@ -1,6 +1,7 @@
 DROP TABLE pods_apiv1;
 CREATE TABLE pods_apiv1 AS SELECT * FROM pods;
 
+ALTER TABLE pods_apiv1 ADD Hgitdate text, ADD Hgitref text, ADD Hruntime text, ADD Hencoding text, ADD longversion text, ADD ptr text, ADD whois text, ADD postalcode text, ADD connection text, ADD pingdomlast text, ADD adminrating decimal, ADD hidden boolean, ADD secure boolean;
 
 ALTER TABLE pods_apiv1 RENAME COLUMN stats_apikey TO pingdomurl;
 ALTER TABLE pods_apiv1 RENAME COLUMN service_xmpp TO xmpp;
@@ -20,8 +21,7 @@ ALTER TABLE pods_apiv1 ALTER COLUMN secure TYPE text USING secure::text;
 ALTER TABLE pods_apiv1 ALTER COLUMN signup TYPE text USING signup::text;
 ALTER TABLE pods_apiv1 ALTER COLUMN responsetimelast7 TYPE text USING responsetimelast7::smallint;
 
-ALTER TABLE pods_apiv1 ADD Hgitdate text, ADD Hgitref text, ADD Hruntime text, ADD Hencoding text, ADD longversion text, ADD ptr text, ADD whois text, ADD postalcode text, ADD connection text, ADD pingdomlast text;
-  
+
 ALTER TABLE pods_apiv1 DROP podmin_statement, DROP sslexpire, DROP dnssec, DROP publickey, DROP podmin_notify;
 
 UPDATE pods_apiv1 SET hgitdate = 'unsupported';
diff --git a/db/pull-masterversions.php b/db/pull-masterversions.php
index 662edc30e8e265b75487be662d9dd91a2c148222..4a3ce17b0a07a25a58416eb2915d10646140d3a7 100644
--- a/db/pull-masterversions.php
+++ b/db/pull-masterversions.php
@@ -1,5 +1,15 @@
 <?php
-//* Copyright (c) 2017, David Morley. This file is licensed under the Affero General Public License version 3 or later. See the COPYRIGHT file. */
+
+/**
+ * Pull master software versions.
+ */
+
+declare(strict_types=1);
+
+if (PHP_SAPI !== 'cli') {
+    header('HTTP/1.0 403 Forbidden');
+    exit;
+}
 
 use RedBeanPHP\R;
 
@@ -14,32 +24,70 @@ R::testConnection() || die('Error in DB connection');
 R::usePartialBeans(true);
 
 $softwares = [
-  'diaspora'     => ['url' => 'https://raw.githubusercontent.com/diaspora/diaspora/master/config/defaults.yml', 'regex' => '/number:.*"(.*)"/'],
-  'friendica'    => ['url' => 'https://raw.githubusercontent.com/friendica/friendica/master/boot.php', 'regex' => '/define.*\'FRIENDICA_VERSION\'.*\'(.*)\'/'],
-  'redmatrix'    => ['url' => 'https://raw.githubusercontent.com/redmatrix/hubzilla/master/boot.php', 'regex' => '/define.*\'STD_VERSION\'.*\'(.*)\'/'],
-  'socialhome'   => ['url' => 'https://raw.githubusercontent.com/jaywink/socialhome/master/socialhome/__init__.py', 'regex' => '/__version__ =.*"(.*)"/'],
-  'social-relay' => ['url' => 'https://raw.githubusercontent.com/jaywink/social-relay/master/social_relay/config.py', 'regex' => '/VERSION.*"(.*)"/'],
-  'ganggo'       => ['url' => 'https://raw.githubusercontent.com/ganggo/ganggo/master/package.json', 'regex' => '/"version": "(.*)"/'],
+    'diaspora'     => ['repo' => 'diaspora/diaspora', 'gitsite' => 'api.github.com', 'gittype' => 'github', 'devbranch' => 'develop'],
+    'friendica'    => ['repo' => 'friendica/friendica', 'gitsite' => 'api.github.com', 'gittype' => 'github', 'devbranch' => 'develop'],
+    'hubzilla'     => ['repo' => 'hubzilla%2fcore', 'gitsite' => 'framagit.org', 'gittype' => 'gitlab', 'devbranch' => 'dev'],
+    'pleroma'      => ['repo' => 'pleroma%2fpleroma', 'gitsite' => 'git.pleroma.social', 'gittype' => 'gitlab', 'devbranch' => 'develop'],
+    'socialhome'   => ['repo' => 'jaywink/socialhome', 'gitsite' => 'api.github.com', 'gittype' => 'github', 'devbranch' => ''],
+    'social-relay' => ['repo' => 'jaywink/social-relay', 'gitsite' => 'api.github.com', 'gittype' => 'github', 'devbranch' => ''],
+    'ganggo'       => ['repo' => 'ganggo%2fganggo', 'gitsite' => 'git.feneas.org', 'gittype' => 'gitlab', 'devbranch' => ''],
+];
+
+$opts = [
+    'http' => ['method' => 'GET', 'header' => ['User-Agent: Poduptime']],
 ];
 
 foreach ($softwares as $software => $details) {
-  $mv = curl_init();
-  curl_setopt($mv, CURLOPT_URL, $details['url']);
-  curl_setopt($mv, CURLOPT_CONNECTTIMEOUT, 5);
-  curl_setopt($mv, CURLOPT_RETURNTRANSFER, 1);
-  $outputmv = curl_exec($mv);
-  curl_close($mv);
-
-  if ($masterversion = preg_match($details['regex'], $outputmv, $version) ? $version[1] : '') {
-    try {
-      $m             = R::dispense('masterversions');
-      $m['software'] = $software;
-      $m['version']  = $masterversion;
-      R::store($m);
-    } catch (\RedBeanPHP\RedException $e) {
-      die('Error in SQL query: ' . $e->getMessage());
+    if ($details['gittype'] == 'github') {
+        $context     = stream_context_create($opts);
+        $releasejson = json_decode(file_get_contents('https://' . $details["gitsite"] . '/repos/' . $details["repo"] . '/releases/latest', false, $context));
+        if ($details["devbranch"]) {
+            $commitjson = json_decode(file_get_contents('https://' . $details["gitsite"] . '/repos/' . $details["repo"] . '/commits/' . $details["devbranch"], false, $context));
+        } else {
+            $commitjson = '';
+        }
+        if ($masterversion = $releasejson->tag_name ? str_replace('v', '', $releasejson->tag_name) : '') {
+            try {
+                $m             = R::dispense('masterversions');
+                $m['software'] = $software;
+                $m['version']  = $masterversion;
+                if ($releasedate = $releasejson ? $releasejson->published_at : '') {
+                    $m['releasedate'] = $releasedate;
+                }
+                if ($devlastcommit = $commitjson ? $commitjson->commit->author->date : '') {
+                    $m['devlastcommit'] = $devlastcommit;
+                }
+                R::store($m);
+            } catch (\RedBeanPHP\RedException $e) {
+                die('Error in SQL query: ' . $e->getMessage());
+            }
+        }
+    } elseif ($details['gittype'] == 'gitlab') {
+        $context     = stream_context_create($opts);
+        $releasejson = json_decode(file_get_contents('https://' . $details["gitsite"] . '/api/v4/projects/' . $details["repo"] . '/repository/tags', false, $context));
+        if ($details["devbranch"]) {
+            $commitjson = json_decode(file_get_contents('https://' . $details["gitsite"] . '/api/v4/projects/' . $details["repo"] . '/repository/commits/' . $details["devbranch"], false, $context));
+        } else {
+            $commitjson = '';
+        }
+        if ($masterversion = $releasejson[0]->name ? str_replace('v', '', $releasejson[0]->name) : '') {
+            try {
+                $m             = R::dispense('masterversions');
+                $m['software'] = $software;
+                $m['version']  = $masterversion;
+                if ($releasedate = $releasejson[0] ? $releasejson[0]->commit->created_at : '') {
+                    $m['releasedate'] = $releasedate;
+                }
+                if ($devlastcommit = $commitjson ? $commitjson->created_at : '') {
+                    $m['devlastcommit'] = $devlastcommit;
+                }
+                R::store($m);
+            } catch (\RedBeanPHP\RedException $e) {
+                die('Error in SQL query: ' . $e->getMessage());
+            }
+        }
     }
-  }
 
-  printf('%s:%s ', $software, $masterversion ?: 'n/a');
+
+    printf('%s:%s:%s ', $software, $masterversion, $devlastcommit ?: 'n/a');
 }
diff --git a/db/pull.php b/db/pull.php
index bc7895855df99590ba0495d874efdc14771eccc4..678396a6616f6eb76579e910649ec730fc372bb3 100644
--- a/db/pull.php
+++ b/db/pull.php
@@ -1,10 +1,29 @@
 <?php
-//* Copyright (c) 2011, David Morley. This file is licensed under the Affero General Public License version 3 or later. See the COPYRIGHT file. */
 
+/**
+ * Pull pod info.
+ */
+
+declare(strict_types=1);
+
+if (!in_array(PHP_SAPI, ['cgi-fcgi', 'cli'])) {
+    $referer = ($_SERVER['HTTP_REFERER'] ? parse_url($_SERVER['HTTP_REFERER'])['host'] : '');
+    if ($referer !== $_SERVER['SERVER_NAME']) {
+        header('HTTP/1.0 403 Forbidden');
+        exit;
+    }
+}
+
+use GeoIp2\Database\Reader;
+use LanguageDetection\Language;
+use Poduptime\PodStatus;
 use RedBeanPHP\R;
 
-$debug   = isset($_GET['debug']) || (isset($argv) && in_array('debug', $argv, true));
-$newline = PHP_SAPI === 'cli' ? "\n" : '<br>';
+$debug    = isset($_GET['debug']) || (isset($argv) && in_array('debug', $argv, true));
+$sqldebug = isset($_GET['sqldebug']) || (isset($argv) && in_array('sqldebug', $argv, true));
+$develop  = isset($_GET['develop']) || (isset($argv) && in_array('develop', $argv, true));
+$write    = !(isset($_GET['nowrite']) || (isset($argv) && in_array('nowrite', $argv, true)));
+$newline  = PHP_SAPI === 'cli' ? "\n\n" : '<br><br>';
 
 $_domain = $_GET['domain'] ?? null;
 
@@ -18,303 +37,397 @@ define('PODUPTIME', microtime(true));
 
 // Set up global DB connection.
 R::setup("pgsql:host={$pghost};dbname={$pgdb}", $pguser, $pgpass, true);
+$sqldebug && R::debug(true);
 R::testConnection() || die('Error in DB connection');
 R::usePartialBeans(true);
 
 try {
-  $sql = '
-    SELECT domain, score, date_created, adminrating, weight, hidden, podmin_notify, email, masterversion, shortversion, status
-    FROM pods
-  ';
-
-  $pods = [];
-  if ($_domain) {
-    $sql .= ' WHERE domain = ?';
-    $pods = R::getAll($sql, [$_domain]);
-  } elseif (PHP_SAPI === 'cli' && (isset($argv) && in_array('Check_System_Deleted', $argv, true))) {
-    $sql .= ' WHERE status = ?';
-    $pods = R::getAll($sql, [PodStatus::System_Deleted]);
-  } elseif (PHP_SAPI === 'cli') {
-    $sql .= ' WHERE status < ?';
-    $pods = R::getAll($sql, [PodStatus::Paused]);
-  }
+    // Setup GeoIP Database
+    $reader = new Reader($geoip2db);
+
+    $sql = '
+        SELECT domain, score, date_created, weight, podmin_notify, email, masterversion, shortversion, status
+        FROM pods
+    ';
+
+    $pods = [];
+
+    if ($_domain) {
+        $sql  .= ' WHERE domain = ?';
+        $pods = R::getAll($sql, [$_domain]);
+    } elseif (PHP_SAPI === 'cli' && (isset($argv) && in_array('Check_System_Deleted', $argv, true))) {
+        $sql  .= ' WHERE status = ?';
+        $pods = R::getAll($sql, [PodStatus::SYSTEM_DELETED]);
+    } elseif (PHP_SAPI === 'cli') {
+        $sql  .= ' WHERE status < ?';
+        $pods = R::getAll($sql, [PodStatus::PAUSED]);
+    }
 } catch (\RedBeanPHP\RedException $e) {
-  die('Error in SQL query: ' . $e->getMessage());
+    die('Error in SQL query: ' . $e->getMessage());
+} catch (\MaxMind\Db\Reader\InvalidDatabaseException $e) {
+    die('Invalid GeoIP database: ' . $e->getMessage());
 }
 
 foreach ($pods as $pod) {
-  $domain    = $pod['domain'];
-  $score     = (int) $pod['score'];
-  $dateadded = $pod['date_created'];
-  $admindb   = (int) $pod['adminrating'];
-  $weight    = $pod['weight'];
-  $hiddennow = $pod['hidden'];
-  $email     = $pod['email'];
-  $notify    = $pod['podmin_notify'];
-  $masterv   = $pod['masterversion'];
-  $shortv    = $pod['shortversion'];
-  $dbstatus  = $pod['status'];
-
-  try {
-    $ratings = R::getAll('
-      SELECT admin, rating
-      FROM rating_comments
-      WHERE domain = ?
-    ', [$domain]);
-  } catch (\RedBeanPHP\RedException $e) {
-    die('Error in SQL query: ' . $e->getMessage());
-  }
+    $domain    = $pod['domain'];
+    $score     = (int) $pod['score'];
+    $dateadded = $pod['date_created'];
+    $weight    = $pod['weight'];
+    $email     = $pod['email'];
+    $notify    = $pod['podmin_notify'];
+    $masterv   = $pod['masterversion'];
+    $shortv    = $pod['shortversion'];
+    $dbstatus  = $pod['status'];
+
+    try {
+        $ratings = R::getAll('
+            SELECT rating
+            FROM ratingcomments
+            WHERE domain = ?
+        ', [$domain]);
+    } catch (\RedBeanPHP\RedException $e) {
+        die('Error in SQL query: ' . $e->getMessage());
+    }
 
-  _debug('Domain', $domain);
+    _debug('Domain', $domain);
 
-  $user_ratings  = [];
-  $admin_ratings = [];
-  foreach ($ratings as $rating) {
-    if ($rating['admin'] == 0) {
-      $user_ratings[] = $rating['rating'];
-    } elseif ($rating['admin'] == 1) {
-      $admin_ratings[] = $rating['rating'];
+    $user_rating = 0;
+
+    if ($user_ratings = array_column($ratings, 'rating')) {
+        $user_rating = round(array_sum($user_ratings) / count($user_ratings), 2);
     }
-  }
-  $user_rating  = empty($user_ratings) ? 0 : max(10, round(array_sum($user_ratings) / count($user_ratings), 2));
-  $admin_rating = empty($admin_ratings) ? 0 : max(10, round(array_sum($admin_ratings) / count($admin_ratings), 2));
-
-  if ($admindb == -1) {
-    $admin_rating = -1;
-  }
-
-  $chss = curl_init();
-  curl_setopt($chss, CURLOPT_URL, 'https://' . $domain . '/nodeinfo/1.0');
-  curl_setopt($chss, CURLOPT_CONNECTTIMEOUT, 10);
-  curl_setopt($chss, CURLOPT_TIMEOUT, 30);
-  curl_setopt($chss, CURLOPT_RETURNTRANSFER, 1);
-  curl_setopt($chss, CURLOPT_CERTINFO, 1);
-  curl_setopt($chss, CURLOPT_CAINFO, $cafullpath);
-  $outputssl      = curl_exec($chss);
-  $outputsslerror = curl_error($chss);
-  $info           = curl_getinfo($chss, CURLINFO_CERTINFO);
-  $conntime       = curl_getinfo($chss, CURLINFO_CONNECT_TIME);
-  $nstime         = curl_getinfo($chss, CURLINFO_NAMELOOKUP_TIME);
-  $latency        = $conntime - $nstime;
-  $sslexpire      = $info[0]['Expire date'] ?? null;
-  curl_close($chss);
-
-  _debug('Nodeinfo output', $outputssl, true);
-  _debug('Nodeinfo output error', $outputsslerror, true);
-  _debug('Cert expire date', $sslexpire);
-  _debug('Conntime', $conntime);
-  _debug('NStime', $nstime);
-  _debug('Latency', $latency);
-
-  $jsonssl = json_decode($outputssl);
-
-  $xdver                 = $jsonssl->software->version ?? 0;
-  $dverr                 = explode('-', trim($xdver));
-  $shortversion          = $dverr[0];
-  $signup                = ($jsonssl->openRegistrations ?? false) === true;
-  $softwarename          = $jsonssl->software->name ?? 'unknown';
-  $name                  = $jsonssl->metadata->nodeName ?? $softwarename;
-  $total_users           = $jsonssl->usage->users->total ?? 0;
-  $active_users_halfyear = $jsonssl->usage->users->activeHalfyear ?? 0;
-  $active_users_monthly  = $jsonssl->usage->users->activeMonth ?? 0;
-  $local_posts           = $jsonssl->usage->localPosts ?? 0;
-  $comment_counts        = $jsonssl->usage->localComments ?? 0;
-  $service_xmpp          = ($jsonssl->metadata->xmppChat ?? false) === true;
-  $service_facebook      = false;
-  $service_twitter       = false;
-  $service_tumblr        = false;
-  $service_wordpress     = false;
-  if (json_last_error() === 0) {
-    (!$jsonssl->software->version) || $score += 1;
-    if (is_array($jsonssl->services->outbound)) {
-      $service_facebook  = in_array('facebook', $jsonssl->services->outbound, true);
-      $service_twitter   = in_array('twitter', $jsonssl->services->outbound, true);
-      $service_tumblr    = in_array('tumblr', $jsonssl->services->outbound, true);
-      $service_wordpress = in_array('wordpress', $jsonssl->services->outbound, true);
-      }
-  }
-
-  if ($jsonssl !== null) {
 
-    try {
-      $c                   = R::dispense('checks');
-      $c['domain']         = $domain;
-      $c['online']         = true;
-      $c['latency']        = $latency;
-      $c['total_users']    = $total_users;
-      $c['local_posts']    = $local_posts;
-      $c['comment_counts'] = $comment_counts;
-      $c['shortversion']   = $shortversion;
-      R::store($c);
-    } catch (\RedBeanPHP\RedException $e) {
-      die('Error in SQL query: ' . $e->getMessage());
+    // Default link to fetch node info.
+    $link = "https://{$domain}/nodeinfo/1.0";
+
+    if (($infos = @file_get_contents("https://{$domain}/.well-known/nodeinfo")) !== false) {
+        $info = json_decode($infos, true);
+        $link = max($info['links'])['href'];
     }
-    
-    $status = PodStatus::Up;
-  }
 
-  if (!$jsonssl) {
-    _debug('Connection', 'Can not connect to pod');
+    _debug('Nodeinfo link', $link);
+
+    $chss = curl_init();
+    curl_setopt($chss, CURLOPT_URL, $link);
+    curl_setopt($chss, CURLOPT_CONNECTTIMEOUT, 10);
+    curl_setopt($chss, CURLOPT_TIMEOUT, 30);
+    curl_setopt($chss, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($chss, CURLOPT_CERTINFO, 1);
+    curl_setopt($chss, CURLOPT_CAINFO, $cafullpath);
+    $outputssl      = curl_exec($chss);
+    $outputsslerror = curl_error($chss);
+    $info           = curl_getinfo($chss, CURLINFO_CERTINFO);
+    $conntime       = curl_getinfo($chss, CURLINFO_CONNECT_TIME);
+    $nstime         = curl_getinfo($chss, CURLINFO_NAMELOOKUP_TIME);
+    $latency        = $conntime - $nstime;
+    $sslexpire      = $info[0]['Expire date'] ?? null;
+    curl_close($chss);
+
+    _debug('Nodeinfo output', $outputssl, true);
+    _debug('Nodeinfo output error', $outputsslerror, true);
+    _debug('Cert expire date', $sslexpire);
+    _debug('Conntime', $conntime);
+    _debug('NStime', $nstime);
+    _debug('Latency', $latency);
+
+    $jsonssl = ($outputssl ? json_decode($outputssl) : null);
+
+    if ($jsonssl !== null) {
+        $version               = $jsonssl->software->version ?? 0;
+        preg_match_all('((?:\d(.|-)?)+(\.)\d+\.*)', $version, $sversion);
+        $shortversion          = $sversion[0][0] ?? '0.0.0.0';
+        $signup                = ($jsonssl->openRegistrations ?? false) === true;
+        $softwarename          = $jsonssl->software->name ?? 'unknown';
+        $name                  = $jsonssl->metadata->nodeName ?? $softwarename;
+        $total_users           = $jsonssl->usage->users->total ?? 0;
+        $active_users_halfyear = $jsonssl->usage->users->activeHalfyear ?? 0;
+        $active_users_monthly  = $jsonssl->usage->users->activeMonth ?? 0;
+        $local_posts           = $jsonssl->usage->localPosts ?? 0;
+        $comment_counts        = $jsonssl->usage->localComments ?? 0;
+        $service_xmpp          = ($jsonssl->metadata->xmppChat ?? false) === true;
+        $service_facebook      = false;
+        $service_twitter       = false;
+        $service_tumblr        = false;
+        $service_wordpress     = false;
+        if (json_last_error() === 0) {
+            (!$jsonssl->software->version) || $score += 1;
+            if (is_array($jsonssl->services->outbound)) {
+                $service_facebook  = in_array('facebook', $jsonssl->services->outbound, true);
+                $service_twitter   = in_array('twitter', $jsonssl->services->outbound, true);
+                $service_tumblr    = in_array('tumblr', $jsonssl->services->outbound, true);
+                $service_wordpress = in_array('wordpress', $jsonssl->services->outbound, true);
+            }
+        }
+
+        try {
+            $c                   = R::dispense('checks');
+            $c['domain']         = $domain;
+            $c['online']         = true;
+            $c['latency']        = $latency;
+            $c['total_users']    = $total_users;
+            $c['local_posts']    = $local_posts;
+            $c['comment_counts'] = $comment_counts;
+            $c['shortversion']   = $shortversion;
+            $c['version']        = $version;
+
+            if ($write) {
+                R::store($c);
+            } else {
+                echo $c;
+            }
+        } catch (\RedBeanPHP\RedException $e) {
+            die('Error in SQL query: ' . $e->getMessage());
+        }
+
+        _debug('Version code', $shortversion);
+
+        try {
+            $masterdata = R::getRow('
+                SELECT version, devlastcommit, releasedate
+                FROM masterversions
+                WHERE software = ?
+                ORDER BY id
+                DESC LIMIT 1
+            ', [$softwarename]);
+        } catch (\RedBeanPHP\RedException $e) {
+            die('Error in SQL query: ' . $e->getMessage());
+        }
+
+        $masterversion = ($masterdata['version'] ?? '0.0.0.0');
+        $devlastcommit = ($masterdata['devlastcommit'] ?? date('Y-m-d H:i:s'));
+        $releasedate   = ($masterdata['releasedate'] ?? date('Y-m-d H:i:s'));
+
+        _debug('Masterversion', $masterversion);
+
+        $masterversioncheck = explode('.', $masterversion);
+        $shortversioncheck  = (strpos($shortversion, '.') ? explode('.', $shortversion) : implode('.', ['0', preg_replace('/\D/', '', $shortversion), '0']));
+        //this is still off with a pod with v1 as total version. cant explode that, won't have a [0] or [1] later to use either
+
+        _debug('Days since master code release', date_diff(new DateTime($releasedate), new DateTime())->format('%d'));
+
+        try {
+            $lastpodupdates = R::getRow('
+                SELECT DISTINCT ON (shortversion, date_checked) shortversion, date_checked
+                FROM checks
+                WHERE domain = ?
+                    AND shortversion IS NOT NULL
+                ORDER BY shortversion DESC, date_checked
+                LIMIT 1
+            ', [$domain]);
+        } catch (\RedBeanPHP\RedException $e) {
+            die('Error in SQL query: ' . $e->getMessage());
+        }
+
+        $lastdatechecked = ($lastpodupdates['date_checked'] ?? date('Y-m-d H:i:s'));
+        $devlastdays     = $devlastcommit ? date_diff(new DateTime($devlastcommit), new DateTime())->format('%a') : 30;//tmp//if no dev branch then what?
+
+        _debug('Dev last commit was  ', $devlastdays);
+
+        $updategap = date_diff(new DateTime($lastdatechecked), new DateTime($devlastcommit))->format('%a');
+
+        if (strpos($version, 'dev') !== false || strpos($version, 'rc') !== false || $shortversioncheck > $masterversioncheck) {
+            //tmp//if pod is on the development branch - see when you last updated your pod and when the last commit was made to dev branch - if the repo is active and your not updating every 120 days why are you on dev branch?
+
+            if ($updategap + $devlastdays > 400) {
+
+                _debug('Outdated More than 400 days', 'Yes');
+
+                $score -= 2;
+            }
+        } elseif (($masterversioncheck[1] - $shortversioncheck[1]) > 1) {
+            ///tmp/If pod is two versions off AND it's been more than 60 days since that release came out AND your on the master production branch
+
+            _debug('Outdated second decimal > 1', 'Yes');
+
+            $score     -= 2;
+            $updategap = date_diff(new DateTime($lastdatechecked), new DateTime($releasedate))->format('%a');
+        } elseif ($updategap - date_diff(new DateTime($releasedate), new DateTime())->format('%a') > 400) {
+
+            _debug('Outdated more than 400 days since x ', 'Yes');
+
+            $score     -= 2;
+            $updategap = date_diff(new DateTime($lastdatechecked), new DateTime($releasedate))->format('%a');
+        } else {
+            $updategap = date_diff(new DateTime($lastdatechecked), new DateTime($releasedate))->format('%a');
+        }
+
+        _debug('Pod code was updated after ', $updategap);
+
+        $status = PodStatus::UP;
+    }
+
+    $d = new DOMDocument;
+    libxml_use_internal_errors(true);
+    $d->loadHTMLFile('https://' . $domain);
+    $body = $d->getElementsByTagName('html')->item(0);
+
+    if ($body) {
+        $ld               = new Language;
+        $detectedlanguage = strtoupper(key($ld->detect($body->nodeValue)->bestResults()->close()));
+    } else {
+        $score -= 1;
+        $detectedlanguage = null;
+    }
+
+    _debug('Detected Language', $detectedlanguage);
+
+    if (!$jsonssl || !$body) {
+
+        _debug('Connection', 'Can not connect to pod');
+
+        try {
+            $c            = R::dispense('checks');
+            $c['domain']  = $domain;
+            $c['online']  = false;
+            $c['error']   = $outputsslerror;
+            $c['latency'] = $latency;
+            if ($write) {
+                R::store($c);
+            } else {
+                echo $c;
+            }
+        } catch (\RedBeanPHP\RedException $e) {
+            die('Error in SQL query: ' . $e->getMessage());
+        }
+
+        $score  -= 1;
+        $status = PodStatus::DOWN;
+    }
+
+    _debug('Signup Open', $signup);
+
+    $dnsserver = !empty($dnsserver) ? $dnsserver : '1.1.1.1';
+    $delv      = new NPM\Xec\Command("delv @{$dnsserver} {$domain}");
+    $delv->throwExceptionOnError(false);
+
+    $ip         = '';
+    $iplookupv4 = explode(PHP_EOL, trim($delv->execute([], null, 15)->stdout));
+    $dnssec     = in_array('; fully validated', $iplookupv4, true) ?? false;
+    $getaonly   = array_values(preg_grep('/\s+IN\s+A\s+.*/', $iplookupv4));
+
+    if ($getaonly) {
+        preg_match('/A\s(.*)/', $getaonly[0], $aversion);
+        $ip = trim($aversion[1]) ?? '';
+    }
+    $ip || $score -= 2;
+
+    $iplookupv6 = explode(PHP_EOL, trim($delv->execute(['AAAA'], null, 15)->stdout));
+    $ipv6       = (bool) preg_grep('/\s+IN\s+AAAA\s+.*/', $iplookupv6);
+
+    _debug('IPv4', $ip);
+    _debug('IPv6', $ipv6);
+
+    if ($ip) {
+        $geo         = $reader->city($ip);
+        $countryname = ($geo->country->name ?? null) ?: null;
+        $country     = ($geo->country->isoCode ?? null) ?: null;
+        $city        = ($geo->city->name ?? null) ?: null;
+        $state       = ($geo->mostSpecificSubdivision->name ?? null) ?: null;
+        $lat         = ($geo->location->latitude ?? null) ?: 0;
+        $long        = ($geo->location->longitude ?? null) ?: 0;
+
+        _debug('Location', json_encode($geo->raw), true);
+    }
+    echo $newline;
+    $statslastdate = date('Y-m-d H:i:s');
+
+    $diff   = (new DateTime())->diff(new DateTime($dateadded));
+    $months = $diff->m + ($diff->y * 12);
+    $days   = $diff->days;
 
     try {
-      $c            = R::dispense('checks');
-      $c['domain']  = $domain;
-      $c['online']  = false;
-      $c['error']   = $outputsslerror;
-      $c['latency'] = $latency;
-      R::store($c);
+        $checks = R::getRow('
+            SELECT
+                round(avg(latency) * 1000) AS latency,
+                round(avg(online::INT) * 100, 2) AS online
+            FROM checks
+            WHERE domain = ?
+        ', [$domain]);
+
+        $avglatency = $checks['latency'] ?? 0;
+        $uptime     = $checks['online'] ?? 0;
     } catch (\RedBeanPHP\RedException $e) {
-      die('Error in SQL query: ' . $e->getMessage());
+        die('Error in SQL query: ' . $e->getMessage());
     }
 
-    $score        -= 1;
-    $status       = PodStatus::Down;
-  }
-
-  _debug('Version code', $shortversion);
-  _debug('Signup Open', $signup);
-
-  $dnsserver = !empty($dnsserver) ? $dnsserver : '1.1.1.1';
-  $delv = new NPM\Xec\Command("delv @{$dnsserver} {$domain}");
-  $delv->throwExceptionOnError(false);
-
-  $ip         = '';
-  $iplookupv4 = explode(PHP_EOL, trim($delv->execute([], null, 15)->stdout));
-  $dnssec     = in_array('; fully validated', $iplookupv4, true) ?? false;
-  $getaonly   = array_values(preg_grep('/\s+IN\s+A\s+.*/', $iplookupv4));
-  if ($getaonly) {
-    preg_match('/A\s(.*)/', $getaonly[0], $aversion);
-    $ip = trim($aversion[1]) ?? '';
-  }
-  $ip || $score -= 2;
-
-  $iplookupv6 = explode(PHP_EOL, trim($delv->execute(['AAAA'], null, 15)->stdout));
-  $ipv6       = (bool) preg_grep('/\s+IN\s+AAAA\s+.*/', $iplookupv6);
-
-  _debug('IPv4', $ip);
-  _debug('Iplookupv4', $iplookupv4, true);
-  _debug('IPv6', $ipv6);
-  _debug('Iplookupv6', $iplookupv6, true);
-
-  $location = geoip_record_by_name($ip);
-  _debug('Location', $location, true);
-  $country  = !empty($location['country_code']) ? iconv('UTF-8', 'UTF-8//IGNORE', $location['country_code']) : null;
-  $city     = !empty($location['city']) ? iconv('UTF-8', 'UTF-8//IGNORE', $location['city']) : null;
-  $state    = !empty($location['region']) ? iconv('UTF-8', 'UTF-8//IGNORE', $location['region']) : null;
-  $lat      = !empty($location['latitude']) ? $location['latitude'] : 0;
-  $long     = !empty($location['longitude']) ? $location['longitude'] : 0;
-
-  echo $newline;
-  $statslastdate = date('Y-m-d H:i:s');
-
-  $diff   = (new DateTime())->diff(new DateTime($dateadded));
-  $months = $diff->m + ($diff->y * 12);
-
-  try {
-    $checks = R::getRow('
-      SELECT
-        round(avg(latency) * 1000) AS latency,
-        round(avg(online::INT) * 100, 2) AS online
-      FROM checks
-      WHERE domain = ?
-    ', [$domain]);
-
-    $avglatency = $checks['latency'] ?? 0;
-    $uptime     = $checks['online'] ?? 0;
-  } catch (\RedBeanPHP\RedException $e) {
-    die('Error in SQL query: ' . $e->getMessage());
-  }
+    _debug('Uptime', $uptime);
 
-  _debug('Uptime', $uptime);
+    if ($score < 70 && $notify && !$develop) {
+        $to      = $email;
+        $headers = ['From: ' . $adminemail, 'Bcc: ' . $adminemail];
+        $subject = 'Monitoring notice from poduptime';
+        $message = 'Notice for ' . $domain . '. Your score fell to ' . $score . ' and your pod is now not showing on the site.';
+        @mail($to, $subject, $message, implode("\r\n", $headers));
 
-  try {
-    $masterversion = R::getCell('SELECT version FROM masterversions WHERE software = ? ORDER BY id DESC LIMIT 1', [$softwarename]);
-  } catch (\RedBeanPHP\RedException $e) {
-    die('Error in SQL query: ' . $e->getMessage());
-  }
-
-  _debug('Masterversion', $masterversion);
-  $masterversioncheck = explode('.',$masterversion);
-  $shortversioncheck = explode('.',$shortversion);
-  if (($masterversioncheck[1] - $shortversioncheck[1]) > 1 && strpos($xdver,'dev') === false) {
-    //dev search added to address frendica using very odd versioning for dev code, we should look to pull dev versions and use them rather than assume dev is always ahead of prod code
-    _debug('Outdated', 'Yes');$score -= 2;
-  }
-
-  $hidden = $score <= 70;
-  _debug('Hidden', $hidden ? 'yes' : 'no');
-
-  if (!$hiddennow && $hidden && $notify && !(isset($argv) && in_array('develop', $argv, true))) {
-    $to      = $email;
-    $headers = ['From: ' . $adminemail, 'Bcc: ' . $adminemail];
-    $subject = 'Monitoring notice from poduptime';
-    $message = 'Notice for ' . $domain . '. Your score fell to ' . $score . ' and your pod is now marked as hidden.';
-    @mail($to, $subject, $message, implode("\r\n", $headers));
-    _debug('Mail Notice', 'sent to ' . $email);
-  }
-  if ($score > 100) {
-    $score = 100;
-  } elseif ($score < 0) {
-    $score = 0;
-    if ($masterv <> $shortv) {
-      $status = PodStatus::System_Deleted;
+        _debug('Mail Notice', 'sent to ' . $email);
     }
-  }
-  _debug('Score', $score);
-  $weightedscore = ($uptime + $score - (10 - $weight)) / 2;
-  _debug('Weighted Score', $weightedscore);
-
-  try {
-    $p                          = R::findOne('pods', 'domain = ?', [$domain]);
-    $p['secure']                = true;
-    $p['hidden']                = $hidden;
-    $p['ip']                    = $ip;
-    $p['ipv6']                  = $ipv6;
-    $p['monthsmonitored']       = $months;
-    $p['uptime_alltime']        = $uptime;
-    $p['status']                = $status;
-    $p['date_laststats']        = $statslastdate;
-    $p['date_updated']          = date('Y-m-d H:i:s');
-    $p['latency']               = $avglatency;
-    $p['score']                 = $score;
-    $p['adminrating']           = $admin_rating;
-    $p['country']               = $country;
-    $p['city']                  = $city;
-    $p['state']                 = $state;
-    $p['lat']                   = $lat;
-    $p['long']                  = $long;
-    $p['userrating']            = $user_rating;
-    $p['masterversion']         = $masterversion;
-    $p['weightedscore']         = $weightedscore;
-    $p['sslvalid']              = $outputsslerror;
-    $p['dnssec']                = $dnssec;
-    $p['sslexpire']             = $sslexpire;
-    if ($dbstatus == PodStatus::Up && $status == PodStatus::Up) {
-      $p['shortversion']          = $shortversion;
-      $p['signup']                = $signup;
-      $p['total_users']           = $total_users;
-      $p['active_users_halfyear'] = $active_users_halfyear;
-      $p['active_users_monthly']  = $active_users_monthly;
-      $p['local_posts']           = $local_posts;
-      $p['name']                  = $name;
-      $p['comment_counts']        = $comment_counts;
-      $p['service_facebook']      = $service_facebook;
-      $p['service_tumblr']        = $service_tumblr;
-      $p['service_twitter']       = $service_twitter;
-      $p['service_wordpress']     = $service_wordpress;
-      $p['service_xmpp']          = $service_xmpp;
-      $p['softwarename']          = $softwarename;
+    if ($score > 100) {
+        $score = 100;
+    } elseif ($score < 0) {
+        $score = 0;
+        $status = PodStatus::SYSTEM_DELETED;
     }
+    $weightedscore = ($uptime + $score - (10 - $weight)) / 2;
 
-    R::store($p);
-  } catch (\RedBeanPHP\RedException $e) {
-    die('Error in SQL query: ' . $e->getMessage());
-  }
+    _debug('Score', $score);
+    _debug('Weighted Score', $weightedscore);
+
+    try {
+        $p                     = R::findOne('pods', 'domain = ?', [$domain]);
+        $p['ip']               = $ip;
+        $p['ipv6']             = $ipv6;
+        $p['daysmonitored']    = $days;
+        $p['monthsmonitored']  = $months;
+        $p['uptime_alltime']   = $uptime;
+        $p['status']           = $status;
+        $p['date_laststats']   = $statslastdate;
+        $p['date_updated']     = date('Y-m-d H:i:s');
+        $p['latency']          = $avglatency;
+        $p['score']            = $score;
+        $p['country']          = $country;
+        $p['countryname']      = $countryname;
+        $p['city']             = $city;
+        $p['state']            = $state;
+        $p['lat']              = $lat;
+        $p['long']             = $long;
+        $p['detectedlanguage'] = $detectedlanguage;
+        $p['userrating']       = $user_rating;
+        $p['masterversion']    = $masterversion;
+        $p['weightedscore']    = $weightedscore;
+        $p['sslvalid']         = $outputsslerror;
+        $p['dnssec']           = $dnssec;
+        $p['sslexpire']        = $sslexpire;
+        if ($dbstatus == PodStatus::UP && $status == PodStatus::UP) {
+            $p['shortversion']          = $shortversion;
+            $p['signup']                = $signup;
+            $p['total_users']           = $total_users;
+            $p['active_users_halfyear'] = $active_users_halfyear;
+            $p['active_users_monthly']  = $active_users_monthly;
+            $p['local_posts']           = $local_posts;
+            $p['name']                  = $name;
+            $p['comment_counts']        = $comment_counts;
+            $p['service_facebook']      = $service_facebook;
+            $p['service_tumblr']        = $service_tumblr;
+            $p['service_twitter']       = $service_twitter;
+            $p['service_wordpress']     = $service_wordpress;
+            $p['service_xmpp']          = $service_xmpp;
+            $p['softwarename']          = $softwarename;
+        }
+
+        if ($write) {
+            R::store($p);
+        } else {
+            echo 'Data not saved, testing only';
+            echo $newline;
+        }
+    } catch (\RedBeanPHP\RedException $e) {
+        die('Error in SQL query: ' . $e->getMessage());
+    }
 
-  echo 'Success ' . $domain;
+    echo 'Success ' . $domain;
 
-  echo $newline;
-  echo $newline;
+    echo $newline;
+    echo $newline;
 }
 
 /**
@@ -326,19 +439,18 @@ foreach ($pods as $pod) {
  */
 function _debug($label, $var = null, $dump = false)
 {
-  global $debug, $newline;
+    global $debug, $newline;
 
-  if (!$debug) {
-    return;
-  }
+    if (!$debug) {
+        return;
+    }
 
-  if ($dump || is_array($var)) {
-    $output = print_r($var, true);
-  } elseif (is_bool($var)) {
-    $output = $var ? 'true' : 'false';
-  } else {
     $output = (string) $var;
-  }
+    if ($dump || is_array($var)) {
+        $output = print_r($var, true);
+    } elseif (is_bool($var)) {
+        $output = $var ? 'true' : 'false';
+    }
 
-  printf('%s: %s%s', $label, $output, $newline);
+    printf('%s: %s%s', $label, $output, $newline);
 }
diff --git a/db/pull.sh b/db/pull.sh
index 2bbca985d973ea7a12956b808b553535d3abe1e7..8c53b14d5a5dd2fec16cbb5f2bbd0ba04b3dce2f 100755
--- a/db/pull.sh
+++ b/db/pull.sh
@@ -1,10 +1,11 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 cd "$SCRIPT_DIR"
 
 FLAG_FILE="/tmp/poduptime.pulling"
-HOUR=`date +%H`
+HOUR=$(date +%H)
+DAY=$(date +%d)
 HAPPY=" :-)"
 SAD=" :-("
 
@@ -24,7 +25,7 @@ if ! wget -q --spider --tries=2 --timeout=15 https://www.google.com; then
 fi
 echo "$HAPPY"
 
-if [ "$HOUR" = 23 ]; then
+if [ "$HOUR" = 23 ] || [ "$1" = 'init' ]; then
   printf "%s" "Pulling in master versions..."
   if php pull-masterversions.php; then
     echo "$HAPPY"
@@ -43,11 +44,21 @@ if [ "$HOUR" = 23 ]; then
   else
     echo "$SAD"
   fi
-  printf "%s" "Updating CA..."
-  if wget -q https://curl.haxx.se/ca/cacert.pem -O ../cacert.pem; then
-    echo "$HAPPY"
-  else
-    echo "$SAD"
+  if [ "$DAY" = 23 ]  || [ "$1" = 'init' ]; then
+    printf "%s" "Updating CA..."
+    CACERT_FILE="$(php -r "include __DIR__ . '/../config.php'; echo \$cafullpath;")"
+    if curl -Lss https://curl.haxx.se/ca/cacert.pem -o "$CACERT_FILE"; then
+      echo "$HAPPY"
+    else
+      echo "$SAD"
+    fi
+    printf "%s" "Updating GeoIP2 DB..."
+    GEODB_FILE="$(php -r "include __DIR__ . '/../config.php'; echo \$geoip2db;")"
+    if funzip <(curl -Lss http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz) > "$GEODB_FILE"; then
+      echo "$HAPPY"
+    else
+      echo "$SAD"
+    fi
   fi
 fi
 
diff --git a/db/saverating.php b/db/saverating.php
index 9610db69648809c54e11bd578c0f51e30a525f5a..2ea148dc4f38f390889181c930296175068fe25c 100644
--- a/db/saverating.php
+++ b/db/saverating.php
@@ -1,16 +1,19 @@
 <?php
 
+/**
+ * Save pod rating.
+ */
+
+declare(strict_types=1);
+
 use RedBeanPHP\R;
 
 // Required parameters.
-($_username = $_POST['username'] ?? null) || die('no username given');
-($_userurl = $_POST['userurl'] ?? null) || die('no userurl given');
+($_username = $_POST['username'] ?? null) || die('Name is required');
+//($_userurl = $_POST['userurl'] ?? null) || die('no userurl given');//lets not annoy people on this for now
 ($_domain = $_POST['domain'] ?? null) || die('no pod domain given');
-($_comment = $_POST['comment'] ?? null) || die('no comment');
-($_rating = $_POST['rating'] ?? null) || die('no rating given');
-
-// Other parameters.
-$_email = $_POST['email'] ?? '';
+($_comment = $_POST['comment'] ?? null) || die('A comment is required');
+($_rating = $_POST['rating'] ?? null) || die('A rating is required');
 
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../config.php';
@@ -23,28 +26,15 @@ R::testConnection() || die('Error in DB connection');
 R::usePartialBeans(true);
 
 try {
-  $r             = R::dispense('rating_comments');
-  $r['domain']   = $_domain;
-  $r['comment']  = $_comment;
-  $r['rating']   = $_rating;
-  $r['username'] = $_username;
-  $r['userurl']  = $_userurl;
-  R::store($r);
+    $r             = R::dispense('ratingcomments');
+    $r['domain']   = $_domain;
+    $r['comment']  = $_comment;
+    $r['rating']   = $_rating;
+    $r['username'] = $_username;
+    //$r['userurl']  = $_userurl;
+    R::store($r);
 } catch (\RedBeanPHP\RedException $e) {
-  die('Error in SQL query: ' . $e->getMessage());
+    die('Error in SQL query: ' . $e->getMessage());
 }
 
-$to      = $adminemail;
-$headers = ['From: ' . $_email];
-$subject = 'New rating added to poduptime ';
-
-$message_lines = [
-  'Pod: ' . $_domain,
-  'Username: ' . $_username,
-  'User URL: ' . $_userurl,
-  'Comment: ' . $_comment,
-  'Rating:' . $_rating,
-];
-
-@mail($to, $subject, implode("\r\n", $message_lines), implode("\r\n", $headers));
-echo 'Comment posted!';
+print 1;
diff --git a/db/status.php b/db/status.php
index 7e01adc4c6c9f2de2e4e9efb69e182df1c44c6ea..044c5a9cbf1f667cebed59d110cc49d3c99cb4e7 100644
--- a/db/status.php
+++ b/db/status.php
@@ -1,8 +1,15 @@
 <?php
+
+/**
+ * Check status of previously pulled data.
+ */
+
+declare(strict_types=1);
+
 $dur = (time() - filemtime('last.data'));
 echo $dur;
 if ($dur > 4500) {
-  http_response_code(500);
+    http_response_code(500);
 } else {
-  http_response_code(200);
-} 
+    http_response_code(200);
+}
diff --git a/db/tables.sql b/db/tables.sql
index 83ba77062cf663130af645e742fd94e2f722e6f1..b413514fb35cd995340e53ae1597a5534102d809 100644
--- a/db/tables.sql
+++ b/db/tables.sql
@@ -8,27 +8,27 @@ CREATE TABLE pods (
  stats_apikey text,
  score int DEFAULT 50,
  weightedscore numeric(5,2) DEFAULT 0,
- adminrating decimal DEFAULT 0,
  userrating decimal DEFAULT 0,
- hidden boolean DEFAULT true,
  ip text,
+ detectedlanguage text,
  country text,
+ countryname text,
  city text,
  state text, 
  lat text,
  long text,
  email text,
  ipv6 boolean,
- secure boolean,
  sslvalid text,
  monthsmonitored int,
+ daysmonitored int,
  signup boolean,
  total_users int, 
  active_users_halfyear int,
  active_users_monthly int,
  local_posts int,
  uptime_alltime numeric(5,2),
- status smallint,
+ status smallint DEFAULT 1,
  latency smallint,
  service_facebook boolean,
  service_twitter boolean,
@@ -49,11 +49,10 @@ CREATE TABLE pods (
  date_created timestamp DEFAULT current_timestamp
 );
 
-CREATE TABLE rating_comments (
+CREATE TABLE ratingcomments (
  id serial8 UNIQUE PRIMARY KEY,
  domain text NOT NULL,
  comment text,
- admin text, 
  pod_id int,
  rating int,
  username text,
@@ -87,6 +86,7 @@ CREATE TABLE checks (
  local_posts int,
  comment_counts int,
  shortversion text,
+ version text,
  date_checked timestamp DEFAULT current_timestamp
 );
 
@@ -94,6 +94,8 @@ CREATE TABLE masterversions (
  id serial8 UNIQUE PRIMARY KEY,
  software text,
  version text,
+ devlastcommit timestamp,
+ releasedate timestamp,
  date_checked timestamp DEFAULT current_timestamp
 );
 
diff --git a/db/version.md b/db/version.md
index 54985c6bd8ddd3b5d8d55aaf294d46a785f2e993..bc4af00546b7a5552c0329674e9426be4bf031c5 100644
--- a/db/version.md
+++ b/db/version.md
@@ -2,13 +2,15 @@ If new install import tables.sql and do not perform migrations
 
 If upgrading migrations are:
 
-v1.0 -> v2.0 = migration00001.sql
+v1.0   -> v2.0   = migration00001.sql
 
-v2.0 -> v2.1 = migration00002.sql
+v2.0   -> v2.1   = migration00002.sql
 
-v2.1 -> v2.1.3 = migration00003.sql
+v2.1   -> v2.1.3 = migration00003.sql
 
-v2.1.4 -> v2.x = migration00004.sql
+v2.1.4 -> v2.2   = migration00004.sql
+
+v2.2   -> v2.3   = migrations00005.sql
 
 To support the original apiv1 you should import:
 pods_apiv1.sql 
diff --git a/go.php b/go.php
index b1b3edcb2afbb59c2c27adee3c2d4c519fcd73aa..78d442ba8b79ca6b6acfd3c498470efaeec82fac 100644
--- a/go.php
+++ b/go.php
@@ -1,7 +1,14 @@
 <?php
 
-use RedBeanPHP\R;
+/**
+ * Redirect to a given pod or find a good fit.
+ */
+
+declare(strict_types=1);
+
+use Carbon\Carbon;
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
+use RedBeanPHP\R;
 
 // Other parameters.
 $_domain = $_GET['domain'] ?? '';
@@ -17,33 +24,34 @@ R::testConnection() || die('Error in DB connection');
 R::usePartialBeans(true);
 
 try {
-  if ($_domain) {
-    $click  = 'manualclick';
-    $domain = R::getCell('SELECT domain FROM pods WHERE domain LIKE ?', [$_domain]);
-    $domain || die('unknown domain');
-  } else {
-    $click  = 'autoclick';
-    $domain = R::getCell('
-      SELECT domain
-      FROM pods
-      WHERE signup
-        AND uptime_alltime > 96
-        AND monthsmonitored > 2
-        AND pods.masterversion = shortversion
-      ORDER BY random()
-      LIMIT 1
-    ');
-    $domain || die('no domains exist');
-  }
-
-  $c           = R::dispense('clicks');
-  $c['domain'] = $domain;
-  $c[$click]   = 1;
-  if (!(new CrawlerDetect())->isCrawler()) {
-    R::store($c);
-  }
-
-  header('Location: https://' . $domain);
+    if ($_domain) {
+        $click  = 'manualclick';
+        $domain = R::getCell('SELECT domain FROM pods WHERE domain LIKE ?', [$_domain]);
+        $domain || die('unknown domain');
+    } else {
+        $click  = 'autoclick';
+        $domain = R::getCell('
+            SELECT domain
+            FROM pods
+            WHERE signup
+                AND uptime_alltime > 96
+                AND monthsmonitored > 2
+                AND pods.masterversion = shortversion
+            ORDER BY random()
+            LIMIT 1
+        ');
+        $domain || die('no domains exist');
+    }
+
+    $c           = R::dispense('clicks');
+    $c['domain'] = $domain;
+    $c[$click]   = 1;
+    if (!(new CrawlerDetect())->isCrawler()) {
+        R::store($c);
+    }
+
+    setcookie('domain', $domain, Carbon::now()->addCentury()->timestamp);
+    header('Location: https://' . $domain);
 } catch (\RedBeanPHP\RedException $e) {
-  die('Error in SQL query: ' . $e->getMessage());
+    die('Error in SQL query: ' . $e->getMessage());
 }
diff --git a/index.php b/index.php
index ce21f2e9ed63edb4e7fc18b8c7d518d158b72235..81096e25f50079bab058004401f51f84932b915b 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Main entry point for podupti.me.
+ */
+
+declare(strict_types=1);
+
+use Carbon\Carbon;
 use RedBeanPHP\R;
 
 require_once __DIR__ . '/vendor/autoload.php';
@@ -22,131 +29,139 @@ $statsview    = isset($_GET['statsview']);
 $podmin       = isset($_GET['podmin']);
 $podminedit   = isset($_GET['podminedit']);
 $edit         = isset($_GET['edit']);
+$add          = isset($_GET['add']);
+$gettoken     = isset($_GET['gettoken']);
 $simpleview   = !($detailedview || $mapview || $podmin || $podminedit || $statsview);
 ?>
 <!doctype html>
 <html lang="en">
 <head>
-  <meta charset="utf-8">
-  <title>Open Source Social Network Pod Uptime Status</title>
-  <meta name="keywords" content="diaspora, federated pods, <?php echo $_SERVER['HTTP_HOST'] ?>, friendica, hubzilla, open source social, open source social network"/>
-  <meta name="description" content="Diaspora Pod Live Status. Find a Diaspora pod to sign up for, rate pods, find one close to you!"/>
-  <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
-  <link rel="stylesheet" href="css/poduptime.css"/>
-  <link rel="stylesheet" href="bower_components/facebox/src/facebox.css"/>
-  <link rel="stylesheet" href="bower_components/jquery-ui/themes/base/jquery-ui.min.css"/>
-  <link rel="stylesheet" href="bower_components/tablesorter/dist/css/theme.bootstrap_4.min.css"/>
-  <meta property="og:url" content="https://<?php echo $_SERVER['HTTP_HOST'] ?>"/>
-  <meta property="og:title" content="Social Network Pod Finder"/>
-  <meta property="og:type" content="website"/>
-  <meta property="og:description" content="Diaspora Pod Live Status. Find a Diaspora pod to sign up for, rate pods, find one close to you!"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=yes">
-  <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta charset="utf-8">
+    <title>Open Source Social Network Pod Uptime Status</title>
+    <meta name="keywords" content="diaspora, federated pods, <?php echo $_SERVER['HTTP_HOST'] ?>, friendica, hubzilla, open source social, open source social network"/>
+    <meta name="description" content="Diaspora Pod Live Status. Find a Diaspora pod to sign up for, rate pods, find one close to you!"/>
+    <link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
+    <link rel="stylesheet" href="css/poduptime.css"/>
+    <link rel="stylesheet" href="node_modules/featherlight/release/featherlight.min.css"/>
+    <link rel="stylesheet" href="node_modules/tablesorter/dist/css/theme.bootstrap_4.min.css"/>
+    <meta property="og:url" content="https://<?php echo $_SERVER['HTTP_HOST'] ?>"/>
+    <meta property="og:title" content="Social Network Pod Finder"/>
+    <meta property="og:type" content="website"/>
+    <meta property="og:description" content="Diaspora Pod Live Status. Find a Diaspora pod to sign up for, rate pods, find one close to you!"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=yes">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
 </head>
 <body>
 
 <?php
 $navs = [
-  'views'  => [
-    ['text' => 'Simple View', 'href' => '/', 'active' => $simpleview],
-    ['text' => 'Detailed View', 'href' => '/?detailedview', 'active' => $detailedview],
-    ['text' => 'Map View', 'href' => '/?mapview', 'active' => $mapview],
-    ['text' => 'Network Stats', 'href' => '/?statsview', 'active' => $statsview],
-  ],
-  'podmin' => [
-    ['text' => 'Add a pod', 'href' => '/?podmin', 'active' => $podmin],
-    ['text' => 'Edit a pod', 'href' => '/?podminedit', 'active' => $podminedit],
-    ['text' => 'Host a pod', 'href' => 'https://diasporafoundation.org/', 'active' => false],
-  ],
-  'links'  => [
-    ['text' => 'Github', 'href' => 'https://github.com/diasporg/Poduptime', 'active' => false],
-    ['text' => 'Contact', 'href' => 'https://dia.so/support', 'active' => false],
-    ['text' => 'Wiki', 'href' => 'https://github.com/diasporg/Poduptime/wiki', 'active' => false],
-    ['text' => 'API', 'href' => 'https://github.com/diasporg/Poduptime/wiki/API', 'active' => false],
-  ],
+    'views' => [
+        ['text' => 'Simple View', 'href' => '/', 'active' => $simpleview],
+        ['text' => 'Detailed View', 'href' => '/?detailedview', 'active' => $detailedview],
+        ['text' => 'Map View', 'href' => '/?mapview', 'active' => $mapview],
+        ['text' => 'Network Stats View', 'href' => '/?statsview', 'active' => $statsview],
+        ['text' => 'Add a pod', 'href' => '/?podmin', 'active' => $podmin],
+        ['text' => 'Edit a pod', 'href' => '/?podminedit', 'active' => $podminedit],
+    ],
+    'links' => [
+        ['text' => 'Github', 'href' => 'https://github.com/diasporg/Poduptime', 'active' => false],
+        ['text' => 'Contact', 'href' => 'https://dia.so/support', 'active' => false],
+        ['text' => 'Wiki', 'href' => 'https://github.com/diasporg/Poduptime/wiki', 'active' => false],
+        ['text' => 'API', 'href' => 'https://github.com/diasporg/Poduptime/wiki/API', 'active' => false],
+        ['text' => 'How to host a pod', 'href' => 'https://diasporafoundation.org/', 'active' => false],
+    ],
 ];
 ?>
 
-<nav class="navbar navbar-inverse bg-primary fixed-top">
-  <button class="navbar-toggler navbar-toggler-right hidden-md-up" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon"></span>
-  </button>
-  <a class="navbar-brand" href="/">Poduptime</a>
-  <div class="collapse navbar-toggleable hidden-md-up" id="navbar">
-    <ul class="navbar-nav">
-      <?php
-      foreach ($navs['views'] as $nav_item) {
-        printf(
-          '<li class="nav-item"><a class="nav-link%1$s" href="%2$s">%3$s%4$s</a></li>',
-          $nav_item['active'] ? ' active' : '',
-          $nav_item['href'],
-          $nav_item['text'],
-          $nav_item['active'] ? ' <span class="sr-only">(current)</span>' : ''
-        );
-      }
-      ?>
-    </ul>
-  </div>
-</nav>
-<div class="container-fluid">
-  <div class="row">
-    <div class="sidebar col-md-3 col-lg-1 hidden-sm-down">
-
-      <?php foreach ($navs as $nav) : ?>
-        <ul class="nav nav-pills flex-column">
-          <?php
-          /** @var array $nav */
-          /** @var array $nav_item */
-          foreach ($nav as $nav_item) {
-            printf(
-              '<li class="nav-item"><a class="nav-link%1$s" href="%2$s">%3$s%4$s</a></li>',
-              $nav_item['active'] ? ' active' : '',
-              $nav_item['href'],
-              $nav_item['text'],
-              $nav_item['active'] ? ' <span class="sr-only">(current)</span>' : ''
-            );
-          }
-          ?>
-        </ul>
-        <hr>
-      <?php endforeach; ?>
-
-      <p>
-        <small>Data refreshed: <br><?php echo date('M d Y H:i', filemtime($lastfile)); ?> EST</small>
-      </p>
+<header>
+    <div class="collapse bg-dark" id="navbarHeader">
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-8 col-md-7 py-4">
+                    <h4 class="text-white">About</h4>
+                    <p class="text-muted">Poduptime helps you find a diaspora, friendica, hubzilla or socialhome pod to use and join the federated social network.</p>
+                    <ul class="navbar-nav">
+                    <?php
+                    foreach ($navs['links'] as $nav_item) {
+                        printf(
+                            '<li class="nav-item"><a href="%1$s">%2$s%3$s</a></li>',
+                            $nav_item['href'],
+                            $nav_item['text'],
+                            $nav_item['active'] ? ' <span class="sr-only">(current)</span>' : ''
+                        );
+                    }
+                    ?>
+                    </ul>
+                </div>
+                <div class="col-sm-4 offset-md-1 py-4">
+                    <h4 class="text-white">Views</h4>
+                    <ul class="navbar-nav">
+                        <?php
+                        foreach ($navs['views'] as $nav_item) {
+                            printf(
+                                '<li class="nav-item"><a class="nav-link%1$s" href="%2$s">%3$s%4$s</a></li>',
+                                $nav_item['active'] ? ' active' : '',
+                                $nav_item['href'],
+                                $nav_item['text'],
+                                $nav_item['active'] ? ' <span class="sr-only">(current)</span>' : ''
+                            );
+                        }
+                        ?>
+                    </ul>
+                </div>
+            </div>
+        </div>
     </div>
-    <div class="main col-md-10 col-lg-11 offset-md-3 offset-lg-1">
-      <a href="go.php" class="btn btn-sm btn-success">Confused? Auto pick a pod for you.</a>
-      <div class="row placeholders">
-      </div>
+    <div class="navbar navbar-dark bg-dark box-shadow">
+        <div class="container d-flex justify-content-between">
+            <a href="/" class="navbar-brand d-flex align-items-center">
+                <strong>Poduptime</strong>
+            </a>
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarHeader" aria-controls="navbarHeader" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+        </div>
+    </div>
+</header>
+<main role="main">
+    <div class="main">
+        <a href="go.php" class="m-1 btn btn-sm btn-info">Confused? Auto pick a pod for you.</a>
+        <div class="row">
+        </div>
         <?php
         if ($detailedview) {
-          include_once __DIR__ . '/showfull.php';
+            include_once __DIR__ . '/showfull.php';
         } elseif ($mapview) {
-          include_once __DIR__ . '/showmap.php';
+            include_once __DIR__ . '/showmap.php';
         } elseif ($statsview) {
-          include_once __DIR__ . '/statsview.php';
+            include_once __DIR__ . '/statsview.php';
         } elseif ($podmin) {
-          include_once __DIR__ . '/podmin.php';
+            include_once __DIR__ . '/podmin.php';
         } elseif ($podminedit) {
-          include_once __DIR__ . '/podminedit.php';
+            include_once __DIR__ . '/podminedit.php';
         } elseif ($edit) {
-          include_once __DIR__ . '/db/edit.php';
+            include_once __DIR__ . '/db/edit.php';
+        } elseif ($add) {
+            include_once __DIR__ . '/db/add.php';
+        } elseif ($gettoken) {
+            include_once __DIR__ . '/db/gettoken.php';
         } else {
-          include_once __DIR__ . '/show.php';
+            include_once __DIR__ . '/show.php';
         }
         ?>
     </div>
-  </div>
-</div>
-<script src="bower_components/jquery/dist/jquery.min.js"></script>
-<script src="bower_components/tablesorter/dist/js/jquery.tablesorter.min.js"></script>
-<script src="js/podup.js"></script>
-<script src="bower_components/tether/dist/js/tether.min.js"></script>
-<script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
-<script src="bower_components/facebox/src/facebox.js"></script>
-<script src="bower_components/jquery-ui/jquery-ui.min.js"></script>
-<script src="bower_components/chart.js/dist/Chart.min.js"></script>
+</main>
+<footer class="m-2 p-2 text-muted">
+    <small>Data refreshed <?php echo Carbon::createFromTimestamp(filemtime($lastfile))->diffForHumans(); ?></small>
+</footer>
+<script src="node_modules/jquery/dist/jquery.min.js"></script>
+<script src="node_modules/tablesorter/dist/js/jquery.tablesorter.combined.min.js"></script>
+<script src="node_modules/tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js"></script>
+<script src="node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+<script src="node_modules/popper.js/dist/popper.js"></script>
+<script src="node_modules/featherlight/release/featherlight.min.js"></script>
+<script src="node_modules/chart.js/dist/Chart.min.js"></script>
 <?php $statsview && include_once __DIR__ . '/statsviewjs.php'; ?>
+<script src="js/podup.js"></script>
 </body>
 </html>
diff --git a/js/podup.js b/js/podup.js
index 97dd8b4d9c8e5f8f1c9027f402592461264f21fd..b1229a385a5ac020ca05df7322f47b990778e68f 100644
--- a/js/podup.js
+++ b/js/podup.js
@@ -1,14 +1,28 @@
-$('.tablesorter-bootstrap').tablesorter()
-$(document).ready(function(){
-$.facebox.settings.closeImage = 'bower_components/facebox/src/closelabel.png'
-$.facebox.settings.loadingImage = 'bower_components/facebox/src/loading.gif'
-  $('a[rel*=facebox]').facebox()
-  $('[data-toggle="tooltip"]').tooltip()
-  $(function () {
-    $('[data-toggle="popover"]').popover()
-  })
-  $('.popover-dismiss').popover({
-    trigger: 'focus'
-  })
-});
+var $table = $('.tablesorter'),
+    pagerOptions = {
+        container: $(".pager"),
+        output: '{startRow} - {endRow} of {totalRows} total',
+        removeRows: false,
+        cssGoto: '.gotoPage'
+    };
 
+$(document).ready(function () {
+    $('.openBtn').on('click', function () {
+        $('#podpull').modal({show: true});
+        $('.modal-body').load('/db/pull.php?debug=1&nowrite=1&domain=' + $(this).val(), function () {
+        });
+    });
+    $table
+        .tablesorter({
+            theme: 'bootstrap',
+            headerTemplate: '{content} {icon}',
+            widthFixed: true,
+            widgets: ['filter', 'saveSort', 'zebra', 'columns'],
+            initialized() {
+                $('.table-responsive').css("visibility", "visible").fadeIn('loading');
+            }
+        })
+        .tablesorterPager(pagerOptions);
+    $('table').trigger('pageSize', 18);
+    $('[data-toggle="tooltip"]').tooltip();
+});
diff --git a/lib/Logging.php b/lib/Logging.php
new file mode 100644
index 0000000000000000000000000000000000000000..9f60af87103f40da60f77471c556e821154cfd74
--- /dev/null
+++ b/lib/Logging.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Logging class:
+ * - contains lfile, lwrite and lclose public methods
+ * - lfile sets path and name of log file
+ * - lwrite writes message to the log file (and implicitly opens log file)
+ * - lclose closes log file
+ * - first call of lwrite method will open log file implicitly
+ * - message is written with the following format: [d/M/Y:H:i:s] (script name) message
+ * - http://www.redips.net/php/write-to-log-file/
+ */
+
+declare(strict_types=1);
+
+namespace Poduptime;
+
+class Logging
+{
+    private $handle;
+    private $log_file;
+
+    public function lfile($path): void
+    {
+        $this->log_file = $path;
+    }
+
+    public function lwrite($message): void
+    {
+        if (!\is_resource($this->handle)) {
+            $this->lopen();
+        }
+        $script_name = pathinfo($_SERVER['PHP_SELF'], PATHINFO_FILENAME);
+        $time        = @date('[d/M/Y:H:i:s]');
+        fwrite($this->handle, "$time ($script_name) $message" . PHP_EOL);
+    }
+
+    public function lclose(): void
+    {
+        fclose($this->handle);
+    }
+
+    private function lopen(): void
+    {
+        $log_file_default = '/tmp/logfile.txt';
+        if (0 === stripos(PHP_OS, 'WIN')) {
+            $log_file_default = 'c:/php/logfile.txt';
+        }
+        $lfile = $this->log_file ?: $log_file_default;
+        $this->handle = fopen($lfile, 'ab') or exit("Can't open {$lfile}!");
+    }
+}
diff --git a/lib/PodStatus.php b/lib/PodStatus.php
index 2a23562e2169e9907d4feea053f4f36f8b395cee..69da0bcf7d2ec7d339e1a4ee69581d5b679ab6f2 100644
--- a/lib/PodStatus.php
+++ b/lib/PodStatus.php
@@ -1,13 +1,21 @@
 <?php
 
+/**
+ * Pod status types enum.
+ */
+
+declare(strict_types=1);
+
+namespace Poduptime;
+
 use CommerceGuys\Enum\AbstractEnum;
 
 final class PodStatus extends AbstractEnum
 {
-    const Down           = 0;
-    const Up             = 1;
-    const Recheck        = 2;
-    const Paused         = 3;
-    const System_Deleted = 4;
-    const User_Deleted   = 5;
+    const DOWN           = 0;
+    const UP             = 1;
+    const RECHECK        = 2;
+    const PAUSED         = 3;
+    const SYSTEM_DELETED = 4;
+    const USER_DELETED   = 5;
 }
diff --git a/logging.php b/logging.php
deleted file mode 100644
index d4198eb68ec53c665c43e61ea8f77b820e3f24f9..0000000000000000000000000000000000000000
--- a/logging.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/** 
- * Logging class:
- * - contains lfile, lwrite and lclose public methods
- * - lfile sets path and name of log file
- * - lwrite writes message to the log file (and implicitly opens log file)
- * - lclose closes log file
- * - first call of lwrite method will open log file implicitly
- * - message is written with the following format: [d/M/Y:H:i:s] (script name) message
- * - http://www.redips.net/php/write-to-log-file/
- */
-class Logging {
-    private $log_file, $fp;
-    public function lfile($path) {
-        $this->log_file = $path;
-    }
-    public function lwrite($message) {
-        if (!is_resource($this->fp)) {
-            $this->lopen();
-        }
-        $script_name = pathinfo($_SERVER['PHP_SELF'], PATHINFO_FILENAME);
-        $time = @date('[d/M/Y:H:i:s]');
-        fwrite($this->fp, "$time ($script_name) $message" . PHP_EOL);
-    }
-    public function lclose() {
-        fclose($this->fp);
-    }
-    private function lopen() {
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-            $log_file_default = 'c:/php/logfile.txt';
-        }
-        else {
-            $log_file_default = '/tmp/logfile.txt';
-        }
-        $lfile = $this->log_file ? $this->log_file : $log_file_default;
-        $this->fp = fopen($lfile, 'a') or exit("Can't open $lfile!");
-    }
-}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..2acec3b441cbc74851af042d5f09699ffe5a1d2b
--- /dev/null
+++ b/package.json
@@ -0,0 +1,27 @@
+{
+    "name": "poduptime",
+    "version": "1.0.0",
+    "description": "Poduptime is software to get live stats and data on listed Diaspora Pods.",
+    "main": "index.php",
+    "dependencies": {
+        "bootstrap": "^4.1.1",
+        "chart.js": "^2.7.2",
+        "featherlight": "^1.7.13",
+        "jquery": "^3.3.1",
+        "leaflet": "^1.3.1",
+        "leaflet.markercluster": "^1.3.0",
+        "popper.js": "^1.14.3",
+        "tablesorter": "^2.30.6"
+    },
+    "devDependencies": {},
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "repository": "git+https://github.com/diasporg/Poduptime.git",
+    "author": "dmorley <david@usr.io>",
+    "license": "AGPL-3.0-or-later",
+    "bugs": {
+        "url": "https://github.com/diasporg/Poduptime/issues"
+    },
+    "homepage": "https://github.com/diasporg/Poduptime#readme"
+}
diff --git a/podmin.php b/podmin.php
index 9b028121bfe226f3a4eb29fc1b7cd16cd3bf7e78..93ad4d26ffa2ed4015dc99443ed778f2cab56121 100644
--- a/podmin.php
+++ b/podmin.php
@@ -1,43 +1,52 @@
+<?php
+
+/**
+ * Form to add a new pod.
+ */
+
+declare(strict_types=1);
+
+?>
+
 <br>
 Want your pod listed? Or to claim a listed pod?<br>
 <br>
-<form action="db/add.php" method="get">
-
-  <div class="form-group row">
-    <label for="domain-input" class="col-2 col-form-label">Pod Domain *</label>
-    <div class="col-10">
-      <div class="input-group mb-2 mr-sm-2 mb-sm-0">
-        <div class="input-group-addon">https://</div>
-        <input type="text" id="domain-input" name="domain" class="form-control" placeholder="domain.com" aria-describedby="domain-help" aria-required="true" required>
-      </div>
-      <small id="domain-help" class="form-text text-muted">The base domain name of your pod (without trailing slash).</small>
+<form method="get">
+    <div class="form-group row">
+        <label for="domain-input" class="col-2 col-form-label">Pod Domain *</label>
+        <div class="col-10">
+            <div class="input-group mb-2 mr-sm-2 mb-sm-0">
+                <div class="input-group-addon">https://</div>
+                <input type="text" id="domain-input" name="domain" class="form-control" placeholder="domain.com" aria-describedby="domain-help" aria-required="true" required>
+            </div>
+            <small id="domain-help" class="form-text text-muted">The base domain name of your pod (without trailing slash).</small>
+        </div>
     </div>
-  </div>
 
-  <div class="form-group row">
-    <label for="email-input" class="col-2 col-form-label">Your Email</label>
-    <div class="col-10">
-      <input type="email" id="email-input" name="email" class="form-control" placeholder="user@domain.com" aria-describedby="email-help">
-      <small id="email-help" class="form-text text-muted">We'll never share your email with anyone else.</small>
+    <div class="form-group row">
+        <label for="email-input" class="col-2 col-form-label">Your Email</label>
+        <div class="col-10">
+            <input type="email" id="email-input" name="email" class="form-control" placeholder="user@domain.com" aria-describedby="email-help">
+            <small id="email-help" class="form-text text-muted">We'll never share your email with anyone else.</small>
+        </div>
     </div>
-  </div>
-
-  <div class="form-group">
-    <label for="podmin-statement-textarea">Podmin Statement</label>
-    <textarea id="podmin-statement-textarea" name="podmin_statement" class="form-control" rows="7" aria-describedby="podmin-statement-help"></textarea>
-    <small id="podmin-statement-help" class="form-text text-muted">You can use HTML to include links to your terms and policies and information about your pod you wish to share with users.</small>
-  </div>
-
-  <div class="form-check">
-    <label class="custom-control custom-checkbox">
-      <input type="checkbox" name="podmin_notify" class="custom-control-input _form-check-input" aria-describedby="notify-hidden-help" checked>
-      <span class="custom-control-indicator"></span>
-      <span class="custom-control-description">Notify if pod falls to hidden status</span>
-    </label>
-    <small id="notify-hidden-help" class="form-text text-muted">You will get a notification if the pod gets hidden due to a bad score.</small>
-  </div>
-
-  <br>
-
-  <button type="submit" class="btn btn-primary">Submit</button>
+
+    <div class="form-group">
+        <label for="podmin-statement-textarea">Podmin Statement</label>
+        <textarea id="podmin-statement-textarea" name="podmin_statement" class="form-control" rows="7" aria-describedby="podmin-statement-help"></textarea>
+        <small id="podmin-statement-help" class="form-text text-muted">You can use HTML to include links to your terms and policies and information about your pod you wish to share with users.</small>
+    </div>
+
+    <div class="form-check">
+        <label class="custom-checkbox">
+            <input type="checkbox" name="podmin_notify" class="_form-check-input" aria-describedby="notify-hidden-help" checked>
+            <span class="custom-control-indicator"></span>
+            <span class="custom-control-description">Notify if pod falls off the list</span>
+        </label>
+        <small id="notify-hidden-help" class="form-text text-muted">You will get a notification if the pod falls off the list due to a bad score.</small>
+    </div>
+
+    <br>
+    <input type="hidden" name="add">
+    <button type="submit" class="btn btn-primary" name="action" value="save">Submit</button>
 </form>
diff --git a/podminedit.php b/podminedit.php
index f7d8aac5cace14c57f2483a4e95aeda53a820131..3f7290282998e456d0ad608f066425307066b706 100644
--- a/podminedit.php
+++ b/podminedit.php
@@ -1,25 +1,34 @@
-<form action="db/gettoken.php" method="post">
+<?php
 
-  <div class="form-group row">
-    <label for="domain-input" class="col-2 col-form-label">Pod Domain *</label>
-    <div class="col-10">
-      <div class="input-group mb-2 mr-sm-2 mb-sm-0">
-        <div class="input-group-addon">https://</div>
-        <input type="text" id="domain-input" name="domain" class="form-control" placeholder="domain.com" aria-describedby="domain-help" aria-required="true" required>
-      </div>
-      <small id="domain-help" class="form-text text-muted">The base domain name of your pod (without trailing slash).</small>
-    </div>
-  </div>
+/**
+ * Form to edit an existing pod.
+ */
+
+declare(strict_types=1);
 
-  <div class="form-group row">
-    <label for="email-input" class="col-2 col-form-label">Registered Email</label>
-    <div class="col-10">
-      <input type="email" id="email-input" name="email" class="form-control" placeholder="user@domain.com" aria-describedby="email-help">
-      <small id="email-help" class="form-text text-muted">Ok to leave blank if you forgot.</small>
+?>
+
+<form method="get">
+    <div class="form-group row">
+        <label for="domain-input" class="col-2 col-form-label">Pod Domain *</label>
+        <div class="col-10">
+            <div class="input-group mb-2 mr-sm-2 mb-sm-0">
+                <div class="input-group-addon">https://</div>
+                <input type="text" id="domain-input" name="domain" class="form-control" placeholder="domain.com" aria-describedby="domain-help" aria-required="true" required>
+            </div>
+            <small id="domain-help" class="form-text text-muted">The base domain name of your pod (without trailing slash).</small>
+        </div>
     </div>
-  </div>
 
-  <br>
+    <div class="form-group row">
+        <label for="email-input" class="col-2 col-form-label">Registered Email</label>
+        <div class="col-10">
+            <input type="email" id="email-input" name="email" class="form-control" placeholder="user@domain.com" aria-describedby="email-help">
+            <small id="email-help" class="form-text text-muted">Ok to leave blank if you forgot.</small>
+        </div>
+    </div>
 
-  <button type="submit" class="btn btn-primary">Submit</button>
+    <br>
+    <input type="hidden" name="gettoken">
+    <button type="submit" class="btn btn-primary">Submit</button>
 </form>
diff --git a/podstat-counts.php b/podstat-counts.php
new file mode 100644
index 0000000000000000000000000000000000000000..d1c571207326ee0b2fefcc70714ea8051b6a9086
--- /dev/null
+++ b/podstat-counts.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * Show detailed pod stats.
+ */
+
+declare(strict_types=1);
+
+use RedBeanPHP\R;
+
+// Required parameters.
+($_domain = $_GET['domain'] ?? null) || die('no domain given');
+
+require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__ . '/config.php';
+
+define('PODUPTIME', microtime(true));
+
+// Set up global DB connection.
+R::setup("pgsql:host={$pghost};dbname={$pgdb}", $pguser, $pgpass, true);
+R::testConnection() || die('Error in DB connection');
+R::usePartialBeans(true);
+
+$sql = "
+    SELECT
+        to_char(date_checked, 'yyyy MM') AS yymm,
+        count(*) AS total_checks,
+        round(avg(total_users)) AS users,
+        round(avg(local_posts)) AS local_posts,
+        round(avg(comment_counts)) AS comment_counts
+    FROM checks
+    WHERE domain = ?
+    GROUP BY yymm
+    ORDER BY yymm
+    LIMIT 24
+";
+
+try {
+    $totals = R::getAll($sql, [$_domain]);
+} catch (\RedBeanPHP\RedException $e) {
+    die('Error in SQL query: ' . $e->getMessage());
+}
+?>
+<div class="chart-container p-1" style="height:400px; width:700px">
+    <canvas id="pod_chart_counts"></canvas>
+</div>
+<script>
+    /**
+     * Add a new chart for the passed data.
+     *
+     * @param id   HTML element ID to place the chart.
+     * @param data Data to display on the chart.
+     */
+    new Chart(document.getElementById('pod_chart_counts'), {
+        type: "line",
+        data: {
+            labels: <?php echo json_encode(array_column($totals, 'yymm')); ?>,
+            datasets: [{
+                data: <?php echo json_encode(array_column($totals, 'users')); ?>,
+                label: 'Users',
+                fill: false,
+                yAxisID: "l2",
+                borderColor: "#e67e22",
+                backgroundColor: "#e67e22",
+                borderWidth: 4,
+                pointHoverRadius: 6
+            }, {
+                data: <?php echo json_encode(array_column($totals, 'local_posts')); ?>,
+                label: 'Local Posts',
+                fill: false,
+                yAxisID: "l2",
+                borderColor: "#2980b9",
+                backgroundColor: "#2980b9",
+                borderWidth: 4,
+                pointHoverRadius: 6
+            }, {
+                data: <?php echo json_encode(array_column($totals, 'comment_counts')); ?>,
+                label: 'Comments',
+                fill: false,
+                yAxisID: "l2",
+                borderColor: "#FFD700",
+                backgroundColor: "#FFD700",
+                borderWidth: 4,
+                pointHoverRadius: 6
+            }]
+        },
+        options: {
+            responsive: true,
+            maintainAspectRatio: true,
+            scales: {
+                yAxes: [{
+                    position: "left",
+                    "id": "l2"
+                }]
+            }
+        }
+    });
+</script>
diff --git a/podstat-uptime.php b/podstat-uptime.php
new file mode 100644
index 0000000000000000000000000000000000000000..74581a5f6aab6e056cdb92c290e02489b1c63485
--- /dev/null
+++ b/podstat-uptime.php
@@ -0,0 +1,102 @@
+<?php
+
+/**
+ * Show detailed pod stats.
+ */
+
+declare(strict_types=1);
+
+use RedBeanPHP\R;
+
+// Required parameters.
+($_domain = $_GET['domain'] ?? null) || die('no domain given');
+
+require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__ . '/config.php';
+
+define('PODUPTIME', microtime(true));
+
+// Set up global DB connection.
+R::setup("pgsql:host={$pghost};dbname={$pgdb}", $pguser, $pgpass, true);
+R::testConnection() || die('Error in DB connection');
+R::usePartialBeans(true);
+
+$sql = "
+    SELECT
+        to_char(date_checked, 'yyyy MM') AS yymm,
+        count(*) AS total_checks,
+        round(avg(online::INT),2)*100 AS uptime,
+        round(avg(latency),2) * 1000 AS latency
+    FROM checks
+    WHERE domain = ?
+    GROUP BY yymm
+    ORDER BY yymm
+    LIMIT 24
+";
+
+try {
+    $totals = R::getAll($sql, [$_domain]);
+} catch (\RedBeanPHP\RedException $e) {
+    die('Error in SQL query: ' . $e->getMessage());
+}
+?>
+<div class="chart-container mb-6 p-1" style="height:400px; width:700px">
+    <canvas id="pod_chart_responses"></canvas>
+</div>
+<script>
+    /**
+     * Add a new chart for the passed data.
+     *
+     * @param id   HTML element ID to place the chart.
+     * @param data Data to display on the chart.
+     */
+    new Chart(document.getElementById('pod_chart_responses'), {
+        type: "line",
+        data: {
+            labels: <?php echo json_encode(array_column($totals, 'yymm')); ?>,
+            datasets: [{
+                data: <?php echo json_encode(array_column($totals, 'uptime')); ?>,
+                label: 'Uptime %',
+                fill: false,
+                yAxisID: "l1",
+                borderColor: "#2ecc71",
+                backgroundColor: "#2ecc71",
+                borderWidth: 4,
+                pointHoverRadius: 6
+            }, {
+                data: <?php echo json_encode(array_column($totals, 'latency')); ?>,
+                label: 'Latency ms',
+                fill: false,
+                yAxisID: "r1",
+                borderColor: "#a93226",
+                backgroundColor: "#a93226",
+                borderWidth: 4,
+                pointHoverRadius: 6,
+                pointStyle: 'rect'
+            }]
+        },
+        options: {
+            responsive: true,
+            maintainAspectRatio: true,
+            scales: {
+                yAxes: [{
+                    position: "left",
+                    "id": "l1",
+                    ticks: {
+                        min: 0,
+                        max: 100,
+                        stepSize: 50
+                    }
+                }, {
+                    position: "right",
+                    "id": "r1",
+                    ticks: {
+                        min: 0,
+                        max: 500,
+                        stepSize: 50
+                    }
+                }]
+            }
+        }
+    });
+</script>
diff --git a/podstat.php b/podstat.php
deleted file mode 100644
index a1cd0410e17d9b776a2d187f34dcb467843c3862..0000000000000000000000000000000000000000
--- a/podstat.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-use RedBeanPHP\R;
-
-// Required parameters.
-($_domain = $_GET['domain'] ?? null) || die('no domain given');
-
-require_once __DIR__ . '/vendor/autoload.php';
-require_once __DIR__ . '/config.php';
-
-define('PODUPTIME', microtime(true));
-
-// Set up global DB connection.
-R::setup("pgsql:host={$pghost};dbname={$pgdb}", $pguser, $pgpass, true);
-R::testConnection() || die('Error in DB connection');
-R::usePartialBeans(true);
-
-$sql = "
-  SELECT
-    to_char(date_checked, 'yyyy MM') AS yymm,
-    count(*) AS total_checks,
-    round(avg(total_users)) AS users,
-    round(avg(online::INT),2)*100 AS uptime,
-    round(avg(latency),2) * 1000 AS latency,
-    round(avg(local_posts)) AS local_posts,
-    round(avg(comment_counts)) AS comment_counts
-  FROM checks
-  WHERE domain = ?
-  GROUP BY yymm
-  ORDER BY yymm
-  LIMIT 24
-";
-
-try {
-  $totals = R::getAll($sql, [$_domain]);
-} catch (\RedBeanPHP\RedException $e) {
-  die('Error in SQL query: ' . $e->getMessage());
-}
-?>
-<canvas id="pod_chart_responses"></canvas>
-<canvas id="pod_chart_counts"></canvas>
-<script>
-  /**
-   * Add a new chart for the passed data.
-   *
-   * @param id   HTML element ID to place the chart.
-   * @param data Data to display on the chart.
-   */
-    new Chart(document.getElementById('pod_chart_responses'), {
-      type: "line",
-      data: {
-        labels: <?php echo json_encode(array_column($totals, 'yymm')); ?>,
-        datasets: [{
-          data: <?php echo json_encode(array_column($totals, 'uptime')); ?>,
-          label: 'Uptime %',
-          fill: false,
-          yAxisID: "l1",
-          borderColor: "#2ecc71",
-          backgroundColor: "#2ecc71",
-          borderWidth: 4,
-          pointHoverRadius: 6
-        },
-        {
-          data: <?php echo json_encode(array_column($totals, 'latency')); ?>,
-          label: 'Latency ms',
-          fill: true,
-          yAxisID: "r1",
-          borderColor: "#a93226",
-          backgroundColor: "#a93226",
-          borderWidth: 4,
-          pointHoverRadius: 6,
-          pointStyle: 'rect',
-        }
-        ]
-      },
-      options: {
-        responsive: true,
-        maintainAspectRatio: true,
-        scales: {
-          yAxes: [{
-            position: "left",
-            "id": "l1",
-            ticks: {
-              min: 0,
-              max: 100,
-              stepSize: 20
-            }
-          }, {
-            position: "right",
-            "id": "r1",
-            ticks: {
-              min: 0,
-              max: 500,
-              stepSize: 50
-            }
-          }]
-        }
-      }
-    });
-        new Chart(document.getElementById('pod_chart_counts'), {
-      type: "line",
-      data: {
-        labels: <?php echo json_encode(array_column($totals, 'yymm')); ?>,
-        datasets: [{
-          data: <?php echo json_encode(array_column($totals, 'users')); ?>,
-          label: 'Users',
-          fill: false,
-          yAxisID: "l2",
-          borderColor: "#e67e22",
-          backgroundColor: "#e67e22",
-          borderWidth: 4,
-          pointHoverRadius: 6,
-        },
-        {
-          data: <?php echo json_encode(array_column($totals, 'local_posts')); ?>,
-          label: 'Local Posts',
-          fill: false,
-          yAxisID: "l2",
-          borderColor: "#2980b9",
-          backgroundColor: "#2980b9",
-          borderWidth: 4,
-          pointHoverRadius: 6,
-        },
-        {
-          data: <?php echo json_encode(array_column($totals, 'comment_counts')); ?>,
-          label: 'Comments',
-          fill: false,
-          yAxisID: "l2",
-          borderColor: "#FFD700",
-          backgroundColor: "#FFD700",
-          borderWidth: 4,
-          pointHoverRadius: 6,
-        }
-        ]
-      },
-      options: {
-        responsive: true,
-        maintainAspectRatio: true,
-        scales: {
-          yAxes: [{
-            position: "left",
-            "id": "l2"
-          }, {
-            position: "right",
-            "id": "r2"
-          }]
-        }
-      }
-    });
-</script>
diff --git a/rate.php b/rate.php
index 4af1f4777d542e8fdb924a1bbdee985af186eeda..38387c0bd078f25cc112e8674fcc91322eeeaa0d 100644
--- a/rate.php
+++ b/rate.php
@@ -1,5 +1,11 @@
 <?php
 
+/**
+ * Popup modal for pod rating.
+ */
+
+declare(strict_types=1);
+
 use RedBeanPHP\R;
 
 ($_domain = $_GET['domain'] ?? null) || die('domain not specified');
@@ -14,90 +20,65 @@ R::setup("pgsql:host={$pghost};dbname={$pgdb}", $pguser, $pgpass, true);
 R::testConnection() || die('Error in DB connection');
 R::usePartialBeans(true);
 ?>
-  <html>
-  <head>
-    <style type="text/css">
-      #slider {
-        margin: 10px;
-        width: 250px;
-        display: inline-block;
-      }
-
-      #rating {
-        height: 35px;
-        width: 35px;
-      }
-    </style>
+<html>
+<head>
     <script>
-      $(document).ready(function () {
-        $('#addrating').click(function () {
-          $('#commentform').show('slow');
-          $('#ratings').hide('slow');
-        });
-        $('#submitrating').click(function () {
-          var domain = '<?php echo $_domain; ?>';
-          $.ajax({
-            type: 'POST',
-            url: 'db/saverating.php',
-            data: 'username=' + $('#username').val() + '&userurl=' + $('#userurl').val() + '&comment=' + $('#comment').val() + '&rating=' + $('#rating').val() + '&domain=' + domain,
-            success: function (msg) {
-              $('#submitrating').unbind('click');
-              if (msg == 1) {
-                $('#commentform').replaceWith('<h3>Your comment was saved, Thank You!</h3>');
-              } else {
-                $('#errortext').html(msg);
-                $('#error').slideDown(633).delay(2500).slideUp(633);
-              }
-            }
-          });
-        });
-
-        $('#slider').slider({
-          animate: true, max: 10, min: 1, step: 1, value: 10, stop: function (event, ui) {
-            var value = $('#slider').slider('option', 'value');
-            $('#rating').prop('value', value)
-          }
+        $(document).ready(function () {
+            $('#addrating').click(function () {
+                $('.ratings').hide('fast');
+                $('#commentform').show('slow');
+            });
+            $('#submitrating').click(function () {
+                var domain = '<?php echo $_domain; ?>';
+                $.ajax({
+                    type: 'POST',
+                    url: 'db/saverating.php',
+                    data: 'username=' + $('#username').val() + '&userurl=' + $('#userurl').val() + '&comment=' + $('#comment').val() + '&rating=' + $('#rating').val() + '&domain=' + domain,
+                    success: function (msg) {
+                        if (msg == 1) {
+                            $('#commentform').replaceWith('<h3>Your comment was saved, Thank You!</h3>');
+                            $('#submitrating').unbind('click');
+                        } else {
+                            $('#errortext').html(msg);
+                            $('#error').slideDown(633).delay(2500).slideUp(633);
+                        }
+                    }
+                });
+            });
         });
-      });
     </script>
-  </head>
+</head>
 <body>
+<div id="commentform" class="container" style="display:none">
+    Would you like to add a comment?<br>
+    <label>Your Name:<br><input id="username" name="username"></label><br>
+    <label>Comment:<br><textarea id="comment" name="comment"></textarea></label><br>
+    <label>Rating (1-10 scale, 10 high):<br><input id="rating" name="rating" type="number" min="1" max="10" step="1"></label><br>
+    <input class="btn primary" id="submitrating" type="submit" value="Submit your Rating">
+    <div class="alert-message warning" id="error" style="display:none">
+        <span id="errortext">Some Error</span>
+    </div>
+</div>
 <div>
-  <?php
+    <?php
 
-  try {
-    $ratings = R::findAll('rating_comments', 'domain LIKE ?', [$_domain]);
-  } catch (\RedBeanPHP\RedException $e) {
-    die('Error in SQL query: ' . $e->getMessage());
-  }
+    try {
+        $ratings = R::findAll('ratingcomments', 'domain LIKE ? ORDER BY date_created DESC LIMIT 8', [$_domain]);
+    } catch (\RedBeanPHP\RedException $e) {
+        die('Error in SQL query: ' . $e->getMessage());
+    }
 
-  echo '<input id="addrating" class="btn primary" style="float:right;margin-right:15px;" type="submit" value="Add a Rating"><h3>Podupti.me ratings for ' . $_domain . ' pod</h3><div id="ratings"><hr>';
-  if (empty($ratings)) {
-    echo '<b>This pod has no rating yet!</b>';
-  } else {
-    foreach ($ratings as $rating) {
-      if ($rating['admin'] === '1') {
-        echo 'Poduptime Approved Comment - User: <b>' . $rating['username'] . '</b> Url: <a href="' . $rating['userurl'] . '">' . $rating['userurl'] . '</a> Rating: <b>' . $rating['rating'] . '</b> <br>';
-        echo '<i>' . $rating['comment'] . '</i><span class="label" title="id: ' . $rating['id'] . '" style="float:right;margin-right:115px;">' . $rating['date_created'] . '</span><hr>';
-      } else {
-        echo 'User Comment - User: <b>' . $rating['username'] . '</b> Url: <a href="' . $rating['userurl'] . '">' . $rating['userurl'] . '</a> Rating: <b>' . $rating['rating'] . '</b> <br>';
-        echo '<i>' . $rating['comment'] . '</i><span class="label" title="id: ' . $rating['id'] . '" style="float:right;margin-right:115px;">' . $rating['date_created'] . '</span><hr style="margin-top:0;margin-bottom:15px;">';
-      }
+    echo '<div class="container ratings"><div class="row"><div class="col col-10"><b>Ratings for ' . $_domain . '</b></div></div>';
+    if (empty($ratings)) {
+        echo '<b>This pod has no rating yet!</b>';
+    } else {
+        foreach ($ratings as $rating) {
+            echo '<div class="m-1 rounded"><div class="row  bg-secondary"><div class="col-10">Comment from: <b>' . $rating['username'] . '</b></div> <div class="col text-right">Rating: ' . $rating['rating'] . '</div></div>';
+            echo '<div class="row"><div class="col-10"><i>' . $rating['comment'] . '</i></div><div class="col text-muted text-right" title="id: ' . $rating['id'] . '">' . date('Y-m-d', strtotime($rating['date_created'])) . '</div></div></div>';
+        }
     }
-  }
-  ?>
+    ?>
+    <input id="addrating" class="btn primary" type="submit" value="Add a Rating">
 </div>
-<div id="commentform" style="display:none">
-  Would you like to add a comment?<br>
-  <label>Your Name (or Diaspora handle)?<br><input id="username" name="username"></label><br>
-  <label>Your Profile URL?<br><input id="userurl" name="userurl"></label><br>
-  <label>Comment<br><textarea id="comment" name="comment"></textarea></label><br>
-  Rating (1-10 scale, 10 high)<br>
-  <div id="slider"></div>
-  <input class="disabled" disabled="" id="rating" name="rating" value="10"><br>
-  <input class="btn primary" id="submitrating" type="submit" value="Submit your Rating">
-  <div class="alert-message warning" id="error" style="display:none">
-    <span id="errortext">Some Error</span>
-  </div>
-</div>
-<?php
+</body>
+</html>
diff --git a/show.php b/show.php
index 392f3f298d884b95ab3f7a5efc285de865a8f697..56382c38c6739630822c449c76cb8d37ced0cb0e 100644
--- a/show.php
+++ b/show.php
@@ -1,72 +1,88 @@
 <?php
 
+/**
+ * Show pod list.
+ */
+
+declare(strict_types=1);
+
+use Carbon\Carbon;
+use Poduptime\PodStatus;
 use RedBeanPHP\R;
 
 defined('PODUPTIME') || die();
 
 try {
-  $pods = R::getAll('
-    SELECT domain, masterversion, shortversion, softwarename, monthsmonitored, podmin_statement, score, signup, name, country, city, state, uptime_alltime, active_users_halfyear, active_users_monthly, service_facebook, service_twitter, service_tumblr, service_wordpress, service_xmpp
-    FROM pods
-    WHERE NOT hidden
-      AND status = ?
-      AND signup
-    ORDER BY weightedscore DESC
-  ', [PodStatus::Up]);
+    $pods = R::getAll('
+        SELECT domain, masterversion, shortversion, softwarename, daysmonitored, podmin_statement, score, signup, name, country, countryname, city, state, uptime_alltime, active_users_halfyear, active_users_monthly, service_facebook, service_twitter, service_tumblr, service_wordpress, service_xmpp
+        FROM pods
+        WHERE signup
+            AND status = ?
+        ORDER BY weightedscore DESC
+    ', [PodStatus::UP]);
 } catch (\RedBeanPHP\RedException $e) {
-  die('Error in SQL query: ' . $e->getMessage());
+    die('Error in SQL query: ' . $e->getMessage());
 }
 
 ?>
 
-<meta property="og:title" content="<?php echo count($pods); ?> Federated Pods listed, Come see the privacy aware social networks."/>
-<div class="hidden-sm-up">Scroll right or rotate device for more</div>
-<div class="table-responsive">
-<table class="table table-striped table-bordered table-sm tablesorter-bootstrap table-hover">
-  <thead class="thead-inverse">
-  <tr>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="A pod is a site for you to set up your account.">Pod</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Percent of the time the pod is online.">Uptime %</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Number of users active last 6 months on this pod.">Active Users</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Pod location, based on IP Geolocation.">Location</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="External Social Networks this pod can post to.">Services Offered</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="More information from the host of this pod.">Info</a></th>
-  </tr>
-  </thead>
-  <tbody>
+<meta property="og:title" content="<?php echo count($pods); ?> Federated Pods listed, Come see the privacy aware social networks." xmlns="http://www.w3.org/1999/html"/>
+<div class="d-md-none">Scroll right or rotate device for more</div>
+<div class="table-responsive loadingtable">
+    <table class="table table-bordered table-sm tablesorter table-hover">
+        <thead class="thead-dark">
+        <tr>
+            <th><div data-toggle="tooltip" title="A pod is a site for you to set up your account.">Pod</div></th>
+            <th><div data-toggle="tooltip" title="Percent of the time the pod is online." data-placeholder="Try: >= 99.94">Uptime %</div></th>
+            <th><div data-toggle="tooltip" title="Number of users active last 6 months on this pod.">Active Users</div></th>
+            <th><div data-toggle="tooltip" title="Pod location, based on IP Geolocation." data-placeholder="Try: <?php echo $country_code ?: 'US'; ?>">Location</div></th>
+            <th><div data-toggle="tooltip" title="External Social Networks this pod can post to." class="filter-false">Services Offered</div></th>
+            <th><div data-toggle="tooltip" title="More information from the host of this pod.">Info</div></th>
+        </tr>
+        </thead>
+        <tbody>
 
-  <?php
-  foreach ($pods as $pod) {
-    $verdiff  = str_replace('.', '', $pod['masterversion']) - str_replace('.', '', $pod['shortversion']);
-    $pod_name = htmlentities($pod['name'], ENT_QUOTES);
-    $tip      = sprintf(
-      'This %3$s pod\'s uptime is %2$s%% over %1$s months.',
-      $pod['monthsmonitored'],
-      $pod['uptime_alltime'],
-      $pod['softwarename']
-    );
-    echo '<tr><td><div title="' . $tip . '" data-toggle="tooltip" data-placement="bottom"><a class="text-success url" target="_self" href="/go.php?domain=' . $pod['domain'] . '">' . $pod['domain'] . '</a></div></td>';
+        <?php
+        foreach ($pods as $pod) {
+            $humanmonitored = Carbon::now()->subDays($pod['daysmonitored'])->diffForHumans(null, true);
+            $tip            = "This {$pod['softwarename']} pod's uptime is {$pod['uptime_alltime']}% over {$humanmonitored}.";
+            echo '<tr>';
+            if (($_COOKIE['domain'] ?? null) === $pod['domain']) {
+                echo '<td data-toggle="tooltip" title="This is the last pod you visited from this site. ' . $tip . '" class="bg-secondary"><a class="text-warning url" target="_self" href="/go.php?domain=' . $pod['domain'] . '">' . $pod['domain'] . '</a></td>';
+            } else {
+                echo '<td data-toggle="tooltip" title="' . $tip . '"><a class="text-success url" target="_self" href="/go.php?domain=' . $pod['domain'] . '">' . $pod['domain'] . '</a></td>';
+            }
+            echo '<td><a href="#" data-featherlight-variant="table-responsive" data-featherlight="podstat-uptime.php?domain=' . $pod['domain'] . '">' . ($pod['uptime_alltime'] > 0 ? $pod['uptime_alltime'] . '%' : '') . '</a></td>';
+            if ($pod['active_users_halfyear'] > 0) {
+                echo '<td data-toggle="tooltip" title="Active users six months: ' . $pod['active_users_halfyear'] . ' Active users one month: ' . $pod['active_users_monthly'] . '">' . $pod['active_users_halfyear'] . '</td>';
+            } else {
+                echo '<td data-toggle="tooltip" title="Pod does not share user data."></td>';
+            }
+            if ($country_code === $pod['country']) {
+                echo '<td class="text-success" data-toggle="tooltip" title="Country: ' . ($pod['countryname'] ?? 'n/a') . '&#0010;City: ' . ($pod['city'] ?? 'n/a') . '&#0010;State: ' . ($pod['state'] ?? 'n/a') . '"><b>' . $pod['country'] . '</b></td>';
+            } else {
+                echo '<td data-toggle="tooltip" title="Country: ' . ($pod['countryname'] ?? 'n/a') . '&#0010;City: ' . ($pod['city'] ?? 'n/a') . '&#0010;State: ' . ($pod['state'] ?? 'n/a') . '">' . $pod['country'] . '</td>';
+            }
+            echo '<td>';
+            $pod['service_facebook'] && print '<div class="smlogo smlogo-facebook" data-toggle="tooltip" title="Publish to Facebook"></div>';
+            $pod['service_twitter'] && print '<div class="smlogo smlogo-twitter" data-toggle="tooltip" title="Publish to Twitter"></div>';
+            $pod['service_tumblr'] && print '<div class="smlogo smlogo-tumblr" data-toggle="tooltip" title="Publish to Tumblr"></div>';
+            $pod['service_wordpress'] && print '<div class="smlogo smlogo-wordpress" data-toggle="tooltip" title="Publish to WordPress"></div>';
+            $pod['service_xmpp'] && print '<div class="smlogo smlogo-xmpp"><img src="/images/icon-xmpp.png" width="16" height="16" data-toggle="tooltip" title="XMPP chat server" alt="XMPP chat server"></div>';
+            echo '</td>';
 
-    echo '<td>' . $pod['uptime_alltime'] . '%</td>';
-    if ($pod['active_users_halfyear'] > 0) {
-    echo '<td data-toggle="tooltip" data-placement="bottom" title="Active users six months: ' . $pod['active_users_halfyear'] . ', Active users one month: ' . $pod['active_users_monthly'] . '">' . $pod['active_users_halfyear'] . '</td>';
-    } else {
-    echo '<td data-toggle="tooltip" data-placement="bottom" title="Pod does not share user data."></td>';
-    }
-    if ($country_code === $pod['country']) {
-      echo '<td class="text-success" data-toggle="tooltip" data-placement="bottom" title="City: ' . ($pod['city'] ?? 'n/a') . ', State: ' . ($pod['state'] ?? 'n/a') . '"><b>' . $pod['country'] . '</b></td>';
-    } else {
-      echo '<td data-toggle="tooltip" data-placement="bottom" title="City: ' . ($pod['city'] ?? 'n/a') . ', State: ' . ($pod['state'] ?? 'n/a') . '">' . $pod['country'] . '</td>';
-    }
-    echo '<td>';
-    $pod['service_facebook'] && print '<div class="smlogo smlogo-facebook" title="Publish to Facebook"></div>';
-    $pod['service_twitter'] && print '<div class="smlogo smlogo-twitter" title="Publish to Twitter"></div>';
-    $pod['service_tumblr'] && print '<div class="smlogo smlogo-tumblr" title="Publish to Tumblr"></div>';
-    $pod['service_wordpress'] && print '<div class="smlogo smlogo-wordpress"  title="Publish to WordPress"></div>';
-    $pod['service_xmpp'] && print '<div class="smlogo smlogo-xmpp"><img src="/images/icon-xmpp.png" width="16" height="16" title="XMPP chat server" alt="XMPP chat server"></div></td>';
-    echo '<td>' . ($pod['podmin_statement'] ? '<a tabindex="0" data-toggle="popover" data-trigger="focus" data-placement="left" title="Podmin Statement" data-html="true" data-content="' . htmlentities($pod['podmin_statement'], ENT_QUOTES) . '">&#128172;</a>' : '&nbsp;') . '</td></tr>';
-  }
-  ?>
-  </tbody>
-</table>
+            $podmin_statement = htmlentities($pod['podmin_statement'] ?? '', ENT_QUOTES);
+            echo '<td>' . ($podmin_statement ? '<a href="#" data-featherlight="<p>' . $podmin_statement . '</p>">&#128172;</a>' : '&nbsp;') . '</td>';
+            echo '</tr>';
+        }
+        ?>
+        </tbody>
+    </table>
+</div>
+<div class="pager">
+    <span class="first pagination" title="First page">&laquo;</span>
+    <span class="prev pagination" title="Previous page">&lt;</span>
+    <span class="pagedisplay"></span>
+    <span class="next pagination" title="Next page">&gt;</span>
+    <span class="last pagination" title="Last page">&raquo;</span>
 </div>
diff --git a/showfull.php b/showfull.php
index 701c028bfd3accbea3cb479d91ef5a0b2110a77f..378c2b4bd52893ac51af2900a2ce330f473208bf 100644
--- a/showfull.php
+++ b/showfull.php
@@ -1,104 +1,139 @@
 <?php
 
+/**
+ * Show detailed pod list.
+ */
+
+declare(strict_types=1);
+
+use Carbon\Carbon;
+use Poduptime\PodStatus;
 use RedBeanPHP\R;
 
 defined('PODUPTIME') || die();
 
 try {
-  $pods = R::getAll('
-    SELECT domain, dnssec, podmin_statement, sslexpire, masterversion, shortversion, softwarename, monthsmonitored, score, signup, name, country, city, state, lat, long, uptime_alltime, active_users_halfyear, active_users_monthly, service_facebook, service_twitter, service_tumblr, service_wordpress, service_xmpp, latency, date_updated, ipv6, total_users, local_posts, comment_counts, userrating, status
-    FROM pods
-    WHERE status < ?
-    ORDER BY weightedscore DESC
-  ', [PodStatus::System_Deleted]);
+    $pods = R::getAll('
+        SELECT domain, dnssec, podmin_statement, sslexpire, masterversion, shortversion, softwarename, daysmonitored, monthsmonitored, score, signup, name, country, countryname, city, state, lat, long, detectedlanguage, uptime_alltime, active_users_halfyear, active_users_monthly, service_facebook, service_twitter, service_tumblr, service_wordpress, service_xmpp, latency, date_updated, ipv6, total_users, local_posts, comment_counts, userrating, status
+        FROM pods
+        WHERE status < ?
+        ORDER BY weightedscore DESC
+    ', [PodStatus::SYSTEM_DELETED]);
 } catch (\RedBeanPHP\RedException $e) {
-  die('Error in SQL query: ' . $e->getMessage());
+    die('Error in SQL query: ' . $e->getMessage());
 }
+
 ?>
 
+<style>
+    @media (max-width: 800px) {
+        .tablesorter-header {
+            background-image: none !important;
+            font: 10px/20px Arial, Sans-serif !important;
+            font-weight: 500 !important;
+        }
+    }
+</style>
 <meta property="og:title" content="<?php echo count($pods); ?> Federated Pods listed, Come see the privacy aware social networks."/>
-<!-- /* Copyright (c) 2011, David Morley. This file is licensed under the Affero General Public License version 3 or later. See the COPYRIGHT file. */ -->
-<div class="table-responsive">
-<table class="table table-striped table-bordered table-sm tablesorter-bootstrap table-hover tfont">
-  <thead class="thead-inverse">
-  <tr>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="A pod is a site for you to set up your account.">Pod</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Version of software this pod runs">Version</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Type of software this pod runs">Software</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Percent of the time the pod is online.">Uptime</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Does this pod offer ipv6 connection.">IPv6</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Average connection latency time in ms from Los Angeles.">Latency</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Does this pod allow new users.">Signups</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Number of total users on this pod.">Users</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Number of users active last 6 months on this pod.">6m</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Number of users active last 1 month on this pod.">1m</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Number of total posts on this pod.">Posts</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Number of total comments on this pod.">Comments</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="How many months have we been watching this pod.">Months</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="User rating for this pod.">Rating</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="System Score on a 100 point scale.">Score</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Does this domain use DNSSEC.">DNSSEC</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Pod location, based on IP Geolocation.">Country</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="External Social Networks this pod can post to.">Services</a></th>
-    <th><a data-toggle="tooltip" data-placement="bottom" title="Click for more information about this pod from the pod host (podmin).">Info</a></th>
-  </tr>
-  </thead>
-  <tbody>
-  <?php
-  foreach ($pods as $pod) {
-    $pod_name = htmlentities($pod['name'], ENT_QUOTES);
-    $tip = "\n Over {$pod['monthsmonitored']} months uptime is {$pod['uptime_alltime']}% and response time is {$pod['latency']}ms, last check on {$pod['date_updated']}. This site is SSL/TLS encrypted with a cert that expires: " . $pod['sslexpire'];
+<div class="d-md-none">Scroll right or rotate device for more</div>
+<div class="table-responsive loadingtable">
+    <table class="table table-bordered table-sm tablesorter table-hover tfont">
+        <thead class="thead-dark">
+        <tr>
+            <th><div data-toggle="tooltip" title="A pod is a site for you to set up your account.">Pod</div></th>
+            <th><div data-toggle="tooltip" title="Version of software this pod runs">Version</div></th>
+            <th><div data-toggle="tooltip" title="Type of software this pod runs">Software</div></th>
+            <th><div data-toggle="tooltip" title="Percent of the time the pod is online.">Uptime</div></th>
+            <th><div data-toggle="tooltip" title="Does this pod offer ipv6 connection.">IPv6</div></th>
+            <th><div data-toggle="tooltip" title="Average connection latency time in ms from Los Angeles.">Latency</div></th>
+            <th><div data-toggle="tooltip" title="Does this pod allow new users.">Signups</div></th>
+            <th><div data-toggle="tooltip" title="Number of total users on this pod.">Users</div></th>
+            <th><div data-toggle="tooltip" title="Number of users active last 6 months on this pod.">6m</div></th>
+            <th><div data-toggle="tooltip" title="Number of users active last 1 month on this pod.">1m</div></th>
+            <th><div data-toggle="tooltip" title="Number of total posts on this pod.">Posts</div></th>
+            <th><div data-toggle="tooltip" title="Number of total comments on this pod." data-placeholder="Try: 10 - 50">Comments</div></th>
+            <th><div data-toggle="tooltip" title="How many months have we been watching this pod." data-placeholder="Try: ! 0">Months</div></th>
+            <th><div data-toggle="tooltip" title="User rating for this pod.">Rating</div></th>
+            <th><div data-toggle="tooltip" title="System Score on a 100 point scale.">Score</div></th>
+            <th><div data-toggle="tooltip" title="Does this domain use DNSSEC.">DNSSEC</div></th>
+            <th><div data-toggle="tooltip" title="Pod location, based on IP Geolocation." data-placeholder="Try: <?php echo $country_code ?: 'US'; ?>">Location</div></th>
+            <th><div data-toggle="tooltip" title="Pod language detected from their main page text.">Language</div></th>
+            <th><div data-toggle="tooltip" title="External Social Networks this pod can post to." class="filter-false">Services</div></th>
+            <th><div data-toggle="tooltip" title="Click for more information about this pod from the pod host (podmin).">Info</div></th>
+        </tr>
+        </thead>
+        <tbody>
+        <?php
+        foreach ($pods as $pod) {
+            $humanmonitored = Carbon::now()->subDays($pod['daysmonitored'])->diffForHumans(null, true);
+            $humanlastcheck = (new Carbon($pod['date_updated']))->diffForHumans();
+            $humansslexpire = (new Carbon($pod['sslexpire']))->diffForHumans();
+            $tip            = "Over the last {$humanmonitored} pod uptime was {$pod['uptime_alltime']}% and response time from Los Angeles was {$pod['latency']}ms, with a SSL cert that expires {$humansslexpire}. This pod was last checked {$humanlastcheck}";
 
-    echo '<tr><td><a title="' . $tip . '" class="text-success url" data-toggle="tooltip" data-placement="bottom" target="_self" href="/go.php?domain=' . $pod['domain'] . '">' . $pod['domain'] . '</a></td>';
+            if (($_COOKIE['domain'] ?? null) === $pod['domain']) {
+                echo '<tr><td class="bg-secondary"><a title="This is the last pod you visited from this site. ' . $tip . '" class="text-warning url" data-toggle="tooltip" target="_self" href="/go.php?domain=' . $pod['domain'] . '">' . $pod['domain'] . '</a></td>';
+            } else {
+                echo '<tr><td><a title="' . $tip . '" class="text-success url" data-toggle="tooltip" target="_self" href="/go.php?domain=' . $pod['domain'] . '">' . $pod['domain'] . '</a></td>';
+            }
 
-    if ($pod['shortversion'] > $pod['masterversion']) {
-      $version = $pod['shortversion'];
-      $pre = 'This pod runs pre release development code';
-    } elseif (!$pod['shortversion']) {
-      $version = '';
-      $pre = 'This pod runs unknown code';
-    } else {
-      $version = $pod['shortversion'];
-      $pre = 'This pod runs production code';
-    }
-    if (version_compare($pod['shortversion'], $pod['masterversion'], '=')) {
-      $classver = 'text-success';
-    } elseif (version_compare($pod['shortversion'], $pod['masterversion'], '<')) {
-      $classver = 'text-warning';
-    } else {
-      $classver = 'black';
-    }
-    echo '<td class="' . $classver . '"><div title="' . $pre . ' version: ' . $pod['shortversion'] . ' master version is: ' . $pod['masterversion'] . '" data-toggle="tooltip" data-placement="bottom">' . $version . '</div></td>';
-    echo '<td>' . $pod['softwarename'] . '</td>';
-    echo '<td><a rel="facebox" href="podstat.php?domain=' . $pod['domain'] . '">' . ($pod['uptime_alltime'] > 0 ? $pod['uptime_alltime'] . '%' : '') . '</a></td>';
-    echo '<td>' . ($pod['ipv6'] ? '&#10003;' : '') . '</td>';
-    echo '<td>' . ($pod['latency'] > 0 ? $pod['latency'] : '') . '</td>';
-    echo '<td>' . ($pod['signup'] ? '&#10003;' : '') . '</td>';
-    echo '<td>' . ($pod['total_users'] > 0 ? $pod['total_users'] : '') . '</td>';
-    echo '<td>' . ($pod['active_users_halfyear'] > 0 ? $pod['active_users_halfyear'] : '') . '</td>';
-    echo '<td>' . ($pod['active_users_monthly'] > 0 ? $pod['active_users_monthly'] : '') . '</td>';
-    echo '<td>' . ($pod['local_posts'] > 0 ? $pod['local_posts'] : '') . '</td>';
-    echo '<td>' . ($pod['comment_counts'] > 0 ? $pod['comment_counts'] : '') . '</td>';
-    echo '<td><div title="Last Check ' . $pod['date_updated'] . '" data-toggle="tooltip" data-placement="bottom">' . $pod['monthsmonitored'] . '</div></td>';
-    echo '<td><a rel="facebox" href="rate.php?domain=' . $pod['domain'] . '">' . $pod['userrating'] . '</a></td>';
-    echo '<td><div title="Pod Status is: ' . PodStatus::getKey((int)$pod['status']) . '" data-toggle="tooltip" data-placement="bottom">' . $pod['score'] . '</div></td>';
-    echo '<td>' . ($pod['dnssec'] ? '&#10003;' : '') . '</td>';
-    if ($country_code === $pod['country']) {
-      echo '<td class="text-success" data-toggle="tooltip" data-placement="bottom" title="City: ' . ($pod['city'] ?? 'n/a') . ' State: ' . ($pod['state'] ?? 'n/a') . '"><b>' . $pod['country'] . '</b></td>';
-    } else {
-      echo '<td data-toggle="tooltip" data-placement="bottom" title="City: ' . ($pod['city'] ?? 'n/a') . ' State: ' . ($pod['state'] ?? 'n/a') . '">' . $pod['country'] . '</td>';
-    }
-    echo '<td>';
-    $pod['service_facebook'] && print '<div class="smlogo smlogo-facebook" title="Publish to Facebook"></div>';
-    $pod['service_twitter'] && print '<div class="smlogo smlogo-twitter" title="Publish to Twitter"></div>';
-    $pod['service_tumblr'] && print '<div class="smlogo smlogo-tumblr" title="Publish to Tumblr"></div>';
-    $pod['service_wordpress'] && print '<div class="smlogo smlogo-wordpress" title="Publish to WordPress"></div>';
-    $pod['service_xmpp'] && print '<div class="smlogo smlogo-xmpp"><img src="/images/icon-xmpp.png" width="16" height="16" title="XMPP chat server" alt="XMPP chat server"></div>';
-    echo '</td>';
+            if ($pod['shortversion'] > $pod['masterversion']) {
+                $version = $pod['shortversion'];
+                $pre     = 'This pod runs pre release development code';
+            } elseif (!$pod['shortversion']) {
+                $version = '';
+                $pre     = 'This pod runs unknown code';
+            } else {
+                $version = $pod['shortversion'];
+                $pre     = 'This pod runs production code';
+            }
+
+            $classver = 'black';
+            if (version_compare($pod['shortversion'] ?? '', $pod['masterversion'] ?? '', '=')) {
+                $classver = 'text-success';
+            } elseif (version_compare($pod['shortversion'] ?? '', $pod['masterversion'] ?? '', '<')) {
+                $classver = 'text-warning';
+            }
+            echo '<td class="' . $classver . '"><div title="' . $pre . ' version: ' . $pod['shortversion'] . ' master version is: ' . ($pod['masterversion'] ?: 'unknown') . '" data-toggle="tooltip">' . $version . '</div></td>';
 
-    echo '<td>' . ($pod['podmin_statement'] ? '<a tabindex="0" data-toggle="popover" data-trigger="focus" data-placement="left" title="Podmin Statement" data-html="true" data-content="' . htmlentities($pod['podmin_statement'], ENT_QUOTES) . '">&#128172;</a>' : '&nbsp;') . '</td></tr>';
-  }
-  ?>
-  </tbody>
-</table>
+            echo '<td>' . $pod['softwarename'] . '</td>';
+            echo '<td><a href="#" data-featherlight-variant="table-responsive" data-featherlight="podstat-uptime.php?domain=' . $pod['domain'] . '">' . ($pod['uptime_alltime'] > 0 ? $pod['uptime_alltime'] . '%' : '') . '</a></td>';
+            echo '<td>' . ($pod['ipv6'] ? 'Y' : 'N') . '</td>';
+            echo '<td>' . ($pod['latency'] > 0 ? $pod['latency'] : '') . '</td>';
+            echo '<td>' . ($pod['signup'] ? 'Y' : 'N') . '</td>';
+            echo '<td><a href="#" data-featherlight-variant="table-responsive" data-featherlight="podstat-counts.php?domain=' . $pod['domain'] . '">' . ($pod['total_users'] > 0 ? $pod['total_users'] : '') . '</a></td>';
+            echo '<td>' . ($pod['active_users_halfyear'] > 0 ? $pod['active_users_halfyear'] : '') . '</td>';
+            echo '<td>' . ($pod['active_users_monthly'] > 0 ? $pod['active_users_monthly'] : '') . '</td>';
+            echo '<td>' . ($pod['local_posts'] > 0 ? $pod['local_posts'] : '') . '</td>';
+            echo '<td>' . ($pod['comment_counts'] > 0 ? $pod['comment_counts'] : '') . '</td>';
+            echo '<td><div title="This pod has been monitored ' . $humanmonitored . '" data-toggle="tooltip">' . $pod['monthsmonitored'] . '</div></td>';
+            echo '<td><a href="#" data-featherlight-variant="table-responsive" data-featherlight="rate.php?domain=' . $pod['domain'] . '">' . $pod['userrating'] . '</a></td>';
+            echo '<td><div title="Pod Status is: ' . PodStatus::getKey((int) $pod['status']) . '" data-toggle="tooltip">' . $pod['score'] . '</div></td>';
+            echo '<td>' . ($pod['dnssec'] ? 'Y' : 'N') . '</td>';
+            if ($country_code === $pod['country']) {
+                echo '<td class="text-success" data-toggle="tooltip" title="Country: ' . ($pod['countryname'] ?? 'n/a') . ' City: ' . ($pod['city'] ?? 'n/a') . ' State: ' . ($pod['state'] ?? 'n/a') . '"><b>' . $pod['country'] . '</b></td>';
+            } else {
+                echo '<td data-toggle="tooltip" title="Country: ' . ($pod['countryname'] ?? 'n/a') . ' City: ' . ($pod['city'] ?? 'n/a') . ' State: ' . ($pod['state'] ?? 'n/a') . '">' . $pod['country'] . '</td>';
+            }
+            echo '<td>' . ($pod['detectedlanguage'] ?: '') . '</td>';
+            echo '<td class="text-truncate">';
+            $pod['service_facebook'] && print '<div class="smlogo smlogo-facebook" data-toggle="tooltip" title="Publish to Facebook"></div>';
+            $pod['service_twitter'] && print '<div class="smlogo smlogo-twitter" data-toggle="tooltip" title="Publish to Twitter"></div>';
+            $pod['service_tumblr'] && print '<div class="smlogo smlogo-tumblr" data-toggle="tooltip" title="Publish to Tumblr"></div>';
+            $pod['service_wordpress'] && print '<div class="smlogo smlogo-wordpress" data-toggle="tooltip" title="Publish to WordPress"></div>';
+            $pod['service_xmpp'] && print '<div class="smlogo smlogo-xmpp"><img src="/images/icon-xmpp.png" width="16" height="16" data-toggle="tooltip" title="XMPP chat server" alt="XMPP chat server"></div>';
+            echo '</td>';
+
+            $podmin_statement = htmlentities($pod['podmin_statement'] ?? '', ENT_QUOTES);
+            echo '<td>' . ($podmin_statement ? '<a href="#" data-featherlight="<p>' . $podmin_statement . '</p>">&#128172;</a>' : '&nbsp;') . '</td></tr>';
+        }
+        ?>
+        </tbody>
+    </table>
+</div>
+<div class="pager">
+    <span class="first pagination" title="First page">&laquo;</span>
+    <span class="prev pagination" title="Previous page">&lt;</span>
+    <span class="pagedisplay"></span>
+    <span class="next pagination" title="Next page">&gt;</span>
+    <span class="last pagination" title="Last page">&raquo;</span>
 </div>
diff --git a/showmap.php b/showmap.php
index d529e47197c58e715ff90749e317e9fa417ed177..e56bade96968b11f817e5c764f9713e63706f7a6 100644
--- a/showmap.php
+++ b/showmap.php
@@ -1,5 +1,12 @@
 <?php
 
+/**
+ * Show map of pods.
+ */
+
+declare(strict_types=1);
+
+use Poduptime\PodStatus;
 use RedBeanPHP\R;
 
 defined('PODUPTIME') || die();
@@ -7,54 +14,53 @@ defined('PODUPTIME') || die();
 require_once __DIR__ . '/config.php';
 
 try {
-  $pods = R::getAll("
-    SELECT domain, signup, name, lat, long, softwarename, uptime_alltime, active_users_halfyear, service_facebook, service_twitter, service_tumblr, service_wordpress, service_xmpp
-    FROM pods
-    WHERE NOT hidden
-      AND lat != ''
-      AND long != ''
-      AND status < ?
-  ", [PodStatus::Recheck]);
+    $pods = R::getAll("
+        SELECT domain, signup, name, lat, long, softwarename, uptime_alltime, active_users_halfyear, service_facebook, service_twitter, service_tumblr, service_wordpress, service_xmpp
+        FROM pods
+        WHERE long != ''
+            AND lat != ''
+            AND status < ?
+    ", [PodStatus::RECHECK]);
 } catch (\RedBeanPHP\RedException $e) {
-  die('Error in SQL query: ' . $e->getMessage());
+    die('Error in SQL query: ' . $e->getMessage());
 }
 
 $csv = array_map('str_getcsv', file('db/country_latlon.csv'));
 foreach ($csv as $cords) {
-  if ($cords[0] === $country_code) {
-    $lat  = $cords[1];
-    $long = $cords[2];
-  } else {
-    $lat = 31;
-    $long = -99;
-  }
+    if ($cords[0] === $country_code) {
+        $lat  = $cords[1];
+        $long = $cords[2];
+    } else {
+        $lat  = 31;
+        $long = -99;
+    }
 }
 ?>
-<link rel="stylesheet" href="bower_components/leaflet/dist/leaflet.css"/>
-<script src="bower_components/leaflet/dist/leaflet.js"></script>
-<script type="text/javascript" src="bower_components/leaflet.markercluster/dist/leaflet.markercluster.js"></script>
+<link rel="stylesheet" href="node_modules/leaflet/dist/leaflet.css"/>
+<script src="node_modules/leaflet/dist/leaflet.js"></script>
+<script type="text/javascript" src="node_modules/leaflet.markercluster/dist/leaflet.markercluster.js"></script>
 <div id="map"></div>
 <script type="text/javascript">
-  var geoJsonData = {
-    'type': 'FeatureCollection',
-    'features': [
-      <?php
+    var geoJsonData = {
+        'type': 'FeatureCollection',
+        'features': [
+            <?php
 
-      $i = 0;
-      foreach ($pods as $pod) {
-        // If this isn't the first entry, put a comma to separate the entries.
-        $i++ > 0 && print ',';
+            $i = 0;
+            foreach ($pods as $pod) {
+                // If this isn't the first entry, put a comma to separate the entries.
+                $i++ > 0 && print ',';
 
-        $feat = '';
-        $pod['service_facebook'] && $feat .= '<div class="smlogo smlogo-facebook" title="Publish to Facebook"></div>';
-        $pod['service_twitter'] && $feat .= '<div class="smlogo smlogo-twitter" title="Publish to Twitter"></div>';
-        $pod['service_tumblr'] && $feat .= '<div class="smlogo smlogo-tumblr" title="Publish to Tumblr"></div>';
-        $pod['service_wordpress'] && $feat .= '<div class="smlogo smlogo-wordpress" title="Publish to WordPress"></div>';
-        $pod['service_xmpp'] && $feat .= '<div class="smlogo smlogo-xmpp"><img src="/images/icon-xmpp.png" width="16" height="16" title="XMPP chat server" alt="XMPP chat server"></div>';
+                $feat = '';
+                $pod['service_facebook'] && $feat .= '<div class="smlogo smlogo-facebook" title="Publish to Facebook"></div>';
+                $pod['service_twitter'] && $feat .= '<div class="smlogo smlogo-twitter" title="Publish to Twitter"></div>';
+                $pod['service_tumblr'] && $feat .= '<div class="smlogo smlogo-tumblr" title="Publish to Tumblr"></div>';
+                $pod['service_wordpress'] && $feat .= '<div class="smlogo smlogo-wordpress" title="Publish to WordPress"></div>';
+                $pod['service_xmpp'] && $feat .= '<div class="smlogo smlogo-xmpp"><img src="/images/icon-xmpp.png" width="16" height="16" title="XMPP chat server" alt="XMPP chat server"></div>';
 
-        $pod_name = htmlentities($pod['name'], ENT_QUOTES);
-        $signup = $pod['signup'] ? 'yes' : 'no';
-        echo <<<EOF
+                $pod_name = htmlentities($pod['name'] ?? '', ENT_QUOTES);
+                $signup   = $pod['signup'] ? 'yes' : 'no';
+                echo <<<EOF
 {
   'type': 'Feature',
   'id': '1',
@@ -67,25 +73,25 @@ foreach ($csv as $cords) {
   }
 }
 EOF;
-      }
-      ?>
-    ]
-  };
-  var tiles = L.tileLayer('https://{s}.tiles.mapbox.com/v4/mapbox.streets/{z}/{x}/{y}.jpg70?access_token=<?php echo $mapboxkey; ?>', {
-    maxZoom: 18,
-    attribution: '<a href="https://www.mapbox.com/about/maps/" target="_blank">&copy; Mapbox &copy; OpenStreetMap</a> <a class="mapbox-improve-map" href="https://www.mapbox.com/map-feedback/" target="_blank">Improve this map</a>'
-  });
-  var map = L.map('map', {zoom: 4, center: [<?php echo $lat; ?>, <?php echo $long; ?>]}).addLayer(tiles);
-  var markers = L.markerClusterGroup({
-    maxClusterRadius: 2, animateAddingMarkers: true, iconCreateFunction: function (cluster) {
-      return new L.DivIcon({html: '<b class="icon">' + cluster.getChildCount() + '</b>', className: 'mycluster', iconSize: L.point(35, 35)});
-    }
-  });
-  var geoJsonLayer = L.geoJson(geoJsonData, {
-    onEachFeature: function (feature, layer) {
-      layer.bindPopup(feature.properties.html);
-    }
-  });
-  markers.addLayer(geoJsonLayer);
-  map.addLayer(markers);
+            }
+            ?>
+        ]
+    };
+    var tiles = L.tileLayer('https://{s}.tiles.mapbox.com/v4/mapbox.streets/{z}/{x}/{y}.jpg70?access_token=<?php echo $mapboxkey; ?>', {
+        maxZoom: 18,
+        attribution: '<a href="https://www.mapbox.com/about/maps/" target="_blank">&copy; Mapbox &copy; OpenStreetMap</a> <a class="mapbox-improve-map" href="https://www.mapbox.com/map-feedback/" target="_blank">Improve this map</a>'
+    });
+    var map = L.map('map', {zoom: 4, center: [<?php echo $lat; ?>, <?php echo $long; ?>]}).addLayer(tiles);
+    var markers = L.markerClusterGroup({
+        maxClusterRadius: 2, animateAddingMarkers: true, iconCreateFunction: function (cluster) {
+            return new L.DivIcon({html: '<b class="icon">' + cluster.getChildCount() + '</b>', className: 'mycluster', iconSize: L.point(35, 35)});
+        }
+    });
+    var geoJsonLayer = L.geoJson(geoJsonData, {
+        onEachFeature: function (feature, layer) {
+            layer.bindPopup(feature.properties.html);
+        }
+    });
+    markers.addLayer(geoJsonLayer);
+    map.addLayer(markers);
 </script>
diff --git a/statsview.php b/statsview.php
index 42920cb3f31fa3ab1c39732411d3078316a92739..e42a50992a95636de3ac7269278ad40777285b83 100644
--- a/statsview.php
+++ b/statsview.php
@@ -1,19 +1,27 @@
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-xs-12 col-sm-6 col-lg-4 text-center">Users by network<br>
-      <center><canvas id="total_network_users" width="300" height="350"></canvas></center>
+<div class="container">
+    <div class="row">
+        <div class="col-xs-12 col-sm-6 col-lg-4 text-center">Users by network<br>
+            <canvas id="total_network_users" width="300" height="350"></canvas>
+        </div>
+        <div class="col-xs-12 col-sm-6 col-lg-4 text-center">Pods by network<br>
+            <canvas id="total_network_pods" width="300" height="350"></canvas>
+        </div>
+        <div class="col-xs-12 col-sm-6 col-lg-4 text-center">Uptime by network<br>
+            <canvas id="total_network_uptime" width="300" height="350"></canvas>
+        </div>
     </div>
-    <div class="col-xs-12 col-sm-6 col-lg-4 text-center">Pods by network<br>
-      <center><canvas id="total_network_pods" width="300" height="350"></canvas></center>
+    <br>
+    <div class="table-responsive">
+        <table class="d-flex justify-content-center">
+            <tbody>
+            <tr>
+                <td>
+                    <div class="col text-center">Average Network User Growth<br>
+                        <canvas id="user_growth" style="height:300px; width:500px"></canvas>
+                    </div>
+                </td>
+            </tr>
+            </tbody>
+        </table>
     </div>
-    <div class="col-xs-12 col-sm-6 col-lg-4 text-center">Uptime by network<br>
-      <center><canvas id="total_network_uptime" width="300" height="350"></canvas></center>
-    </div>
-  </div>
-  <br>
-  <div class="row">
-      <div class="col text-center">Average Network User Growth<br>
-      <center><canvas id="user_growth" width="1000" height="300"></canvas></center>
-    </div>
-  </div>
 </div>
diff --git a/statsviewjs.php b/statsviewjs.php
index fd471a76866c8d5c8e323ae7f15611b6deb567da..e979437ce82d8425b3093e104e52f82de7cbce56 100644
--- a/statsviewjs.php
+++ b/statsviewjs.php
@@ -1,87 +1,101 @@
 <?php
 
+/**
+ * Include JS for stats view.
+ */
+
+declare(strict_types=1);
+
+use Poduptime\PodStatus;
 use RedBeanPHP\R;
 
 defined('PODUPTIME') || die();
 
 try {
-  $totals = R::getAll('
-    SELECT
-      softwarename,
-      count(*) AS pods,
-      sum(total_users) AS users,
-      round(avg(uptime_alltime),2) AS uptime
-    FROM pods
-    WHERE status < ?
-    GROUP BY softwarename
-  ', [PodStatus::System_Deleted]);
+    $totals = R::getAll('
+        SELECT
+            softwarename,
+            count(*) AS pods,
+            sum(total_users) AS users,
+            round(avg(uptime_alltime),2) AS uptime
+        FROM pods
+        WHERE status < ?
+        GROUP BY softwarename
+        ORDER BY softwarename
+    ', [PodStatus::SYSTEM_DELETED]);
 } catch (\RedBeanPHP\RedException $e) {
-  die('Error in SQL query: ' . $e->getMessage());
+    die('Error in SQL query: ' . $e->getMessage());
 }
 
 try {
-  $check_totals = R::getAll("
-    SELECT
-      to_char(date_checked, 'yyyy-mm') AS yymm,
-      total_users AS users
-    FROM monthlystats
-    GROUP BY yymm, users
-    ORDER BY yymm
-  ");
+    $check_totals = R::getAll("
+        SELECT
+            to_char(date_checked, 'yyyy-mm') AS yymm,
+            total_users AS users
+        FROM monthlystats
+        GROUP BY yymm, users
+        ORDER BY yymm
+    ");
 } catch (\RedBeanPHP\RedException $e) {
-  die('Error in SQL query: ' . $e->getMessage());
+    die('Error in SQL query: ' . $e->getMessage());
 }
 
 ?>
 <script>
-  /**
-   * Add a new chart for the passed data.
-   *
-   * @param id   HTML element ID to place the chart.
-   * @param data Data to display on the chart.
-   */
-  function addPieChart(id, data) {
-    new Chart(document.getElementById(id), {
-      type: "pie",
-      data: {
-        labels: <?php echo json_encode(array_column($totals, 'softwarename')); ?>,
-        datasets: [{
-          data: data,
-          backgroundColor: ["#FF6384", "#36A2EB", "#FFCE56", "#419641", "#A569BD", "#EB984E"],
-          hoverBackgroundColor: ["#FF6360", "#36A2AD", "#FFCE10", "#419615", "#A569AA", "#EB980A"]
-        }]
-      },
-      options: {
-        responsive: false,
-        maintainAspectRatio: false
-      }
-    });
-  }
-  function addLineChart(id, data) {
-      new Chart(document.getElementById(id), {
-      type: "line",
-      data: {
-        labels: <?php echo json_encode(array_column($check_totals, 'yymm')); ?>,
-        datasets: [{
-          data: <?php echo json_encode(array_column($check_totals, 'users')); ?>,
-          label: 'Users',
-          fill: false,
-          borderColor: "#2ecc71",
-          backgroundColor: "#2ecc71",
-          borderWidth: 2,
-          pointHoverRadius: 2
-        }
-        ]
-      },
-      options: {
-        responsive: false,
-        maintainAspectRatio: false
-      }
-    });
-  }
+    /**
+     * Add a new pie chart for the passed data.
+     *
+     * @param id   HTML element ID to place the chart.
+     * @param data Data to display on the chart.
+     */
+    function addPieChart(id, data) {
+        new Chart(document.getElementById(id), {
+            type: "pie",
+            data: {
+                labels: <?php echo json_encode(array_column($totals, 'softwarename')); ?>,
+                datasets: [{
+                    data: data,
+                    backgroundColor: ["#C8412E", "#36A2EB", "#FFCE56", "#419641", "#A569BD", "#EB984E", "#AC8416", "#4F8AAA", "#19FFE2", "#87FE12", "#F3BB88"],
+                    hoverBackgroundColor: ["#C8887B", "#36A2AD", "#FFCE10", "#419615", "#A569AA", "#EB980A", "#AC8456", "#4F8BAB", "#19FFE9", "#87FE32", "#F3FB88"]
+                }]
+            },
+            options: {
+                responsive: false,
+                maintainAspectRatio: false
+            }
+        });
+    }
+
+    /**
+     * Add a new line chart for the passed data.
+     *
+     * @param id   HTML element ID to place the chart.
+     * @param data Data to display on the chart.
+     */
+    function addLineChart(id, data) {
+        new Chart(document.getElementById(id), {
+            type: "line",
+            data: {
+                labels: <?php echo json_encode(array_column($check_totals, 'yymm')); ?>,
+                datasets: [{
+                    data: data,
+                    label: 'Users',
+                    fill: false,
+                    borderColor: "#2ecc71",
+                    backgroundColor: "#2ecc71",
+                    borderWidth: 2,
+                    pointHoverRadius: 6
+                }]
+            },
+            options: {
+                responsive: false,
+                maintainAspectRatio: false
+            }
+        });
+    }
 
-  addPieChart('total_network_users', <?php echo json_encode(array_column($totals, 'users')); ?>);
-  addPieChart('total_network_pods', <?php echo json_encode(array_column($totals, 'pods')); ?>);
-  addPieChart('total_network_uptime', <?php echo json_encode(array_column($totals, 'uptime')); ?>);
-  addLineChart('user_growth', <?php echo json_encode(array_column($check_totals, 'users')); ?>);
+    addPieChart('total_network_users', <?php echo json_encode(array_column($totals, 'users')); ?>);
+    addPieChart('total_network_pods', <?php echo json_encode(array_column($totals, 'pods')); ?>);
+    addPieChart('total_network_uptime', <?php echo json_encode(array_column($totals, 'uptime')); ?>);
+    addLineChart('user_growth', <?php echo json_encode(array_column($check_totals, 'users')); ?>);
 </script>
diff --git a/travis.yml b/travis.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b1fc6e58625fb53b22f0b46cfac17026109da3b8
--- /dev/null
+++ b/travis.yml
@@ -0,0 +1,24 @@
+# .travis.yml
+language: php
+
+php:
+  - 7.2
+  - 7.3
+
+# In case of timeouts and build failures you may want to prepend 'travis_retry' to the following commands:
+before_script:
+  - curl -s http://getcomposer.org/installer | php
+  - php composer.phar install -n
+
+script:
+  - php vendor/bin/phpunit
+
+after_script:
+  - php vendor/bin/codacycoverage clover build/coverage/xml
+
+# whitelist
+branches:
+  only:
+    - master
+    - develop
+
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 0000000000000000000000000000000000000000..e617f0b8f6eb0dc5f58695c83b24715b3abc0165
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,65 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+bootstrap@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.1.tgz#3aec85000fa619085da8d2e4983dfd67cf2114cb"
+
+chart.js@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.7.2.tgz#3c9fde4dc5b95608211bdefeda7e5d33dffa5714"
+  dependencies:
+    chartjs-color "^2.1.0"
+    moment "^2.10.2"
+
+chartjs-color-string@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz#8d3752d8581d86687c35bfe2cb80ac5213ceb8c1"
+  dependencies:
+    color-name "^1.0.0"
+
+chartjs-color@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.2.0.tgz#84a2fb755787ed85c39dd6dd8c7b1d88429baeae"
+  dependencies:
+    chartjs-color-string "^0.5.0"
+    color-convert "^0.5.3"
+
+color-convert@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
+
+color-name@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+
+featherlight@^1.7.13:
+  version "1.7.13"
+  resolved "https://registry.yarnpkg.com/featherlight/-/featherlight-1.7.13.tgz#500f53204ba7b5bb4650370dd94ae5965c556e94"
+
+jquery@>=1.2.6, jquery@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
+
+leaflet.markercluster@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/leaflet.markercluster/-/leaflet.markercluster-1.3.0.tgz#58eb0654e90bd3274a660390ab0bc734212b204d"
+
+leaflet@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.3.1.tgz#86f336d2fb0e2d0ff446677049a5dc34cf0ea60e"
+
+moment@^2.10.2:
+  version "2.22.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
+
+popper.js@^1.14.3:
+  version "1.14.3"
+  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.3.tgz#1438f98d046acf7b4d78cd502bf418ac64d4f095"
+
+tablesorter@^2.30.6:
+  version "2.30.6"
+  resolved "https://registry.yarnpkg.com/tablesorter/-/tablesorter-2.30.6.tgz#d24b0a5a9e44f9970d41f51a7d194d538fc6f953"
+  dependencies:
+    jquery ">=1.2.6"