diff --git a/listing.yaml b/listing.yaml
index e598768..537670e 100644
--- a/listing.yaml
+++ b/listing.yaml
@@ -29,6 +29,26 @@ servers:
     region: "New York"
     admins: ["core", "terra"]
 
+  - hostname: de-fsn1
+    public: true
+    public_ips: ["78.47.43.220"]
+    edge: true
+    domain: de-fsn1.e3t.cc
+    ownership: rented
+    country: "Germany"
+    region: "Falkenstien"
+    admins: ["core", "terra"]
+
+  - hostname: de-fnk1
+    public: true
+    public_ips: ["141.147.35.117"]
+    edge: true
+    domain: de-fnk1.e3t.cc
+    ownership: rented
+    country: "Germany"
+    region: "Frankfurt"
+    admins: ["core"]
+
   - hostname: ghost-east1
     public: true
     public_ips: ["5.183.8.190"]
diff --git a/servers.html b/servers.html
index 7f7fc05..01a60ac 100644
--- a/servers.html
+++ b/servers.html
@@ -1 +1 @@
-<html><head><title>e3team Servers</title><meta charset="utf-8"/><meta content="width=device-width,initial-scale=1" name="viewport"/><link href="nav.css" rel="stylesheet"/></head><body><div id="nav"><div class="nav-section"><span>Navigation</span><a class="nav-item" href="/">About</a><a class="nav-item" href="/services.html">Services</a><a class="nav-item" href="/servers.html">Machines</a></div><div class="nav-section nav-section-bottom">Free now and forever.</div></div><div id="main"><h1>e3team-owned servers</h1><p>e3team owns and controls several servers around the globe. Following is a list of them all:</p><table style="border: 1px solid;"><tr><th style="border: 1px solid;">Hostname</th><th style="border: 1px solid;">Public?</th><th style="border: 1px solid;">Public IP</th><th style="border: 1px solid;">Edge?</th><th style="border: 1px solid;">Domain Name</th><th style="border: 1px solid;">Ownership</th><th style="border: 1px solid;">Country</th><th style="border: 1px solid;">Region</th><th style="border: 1px solid;">Primary Admin(s)</th></tr><tr><td style="border: 1px solid;">east1</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">198.98.60.198</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">east1.e3t.cc</td><td style="border: 1px solid;">Rented</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">New York</td><td style="border: 1px solid;">core, terra</td></tr><tr><td style="border: 1px solid;">east2</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">198.98.48.77</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">east2.e3t.cc</td><td style="border: 1px solid;">Rented</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">New York</td><td style="border: 1px solid;">core, terra</td></tr><tr><td style="border: 1px solid;">east3</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">199.195.249.198</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">east3.e3t.cc</td><td style="border: 1px solid;">Rented</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">New York</td><td style="border: 1px solid;">core, terra</td></tr><tr><td style="border: 1px solid;">ghost-east1</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">5.183.8.190</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">stkserver.e3t.cc</td><td style="border: 1px solid;">Rented</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Asheville</td><td style="border: 1px solid;">ghost</td></tr><tr><td style="border: 1px solid;">central1</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Ohio</td><td style="border: 1px solid;">terra</td></tr><tr><td style="border: 1px solid;">central2</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Ohio</td><td style="border: 1px solid;">terra</td></tr><tr><td style="border: 1px solid;">cluster0</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Ohio</td><td style="border: 1px solid;">terra</td></tr><tr><td style="border: 1px solid;">core-pi</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">North Carolina</td><td style="border: 1px solid;">core</td></tr><tr><td style="border: 1px solid;">terra-pi4</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Ohio</td><td style="border: 1px solid;">terra</td></tr><tr><td style="border: 1px solid;">terra-pi1b</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Ohio</td><td style="border: 1px solid;">nishi, terra</td></tr><tr><td style="border: 1px solid;">fxtwr</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Ohio</td><td style="border: 1px solid;">terra</td></tr><tr><td style="border: 1px solid;">terra-mm12</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Ohio</td><td style="border: 1px solid;">nishi</td></tr><tr><td style="border: 1px solid;">nishivoid-c2d</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">Japan</td><td style="border: 1px solid;">Chiba</td><td style="border: 1px solid;">nishi</td></tr><tr><td style="border: 1px solid;">nishinbsd-c2d</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">Japan</td><td style="border: 1px solid;">Chiba</td><td style="border: 1px solid;">nishi</td></tr><tr><td style="border: 1px solid;">nishinbsd-g4</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">Japan</td><td style="border: 1px solid;">Chiba</td><td style="border: 1px solid;">nishi</td></tr><tr><td style="border: 1px solid;">nishinbsd-fmv</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">Japan</td><td style="border: 1px solid;">Chiba</td><td style="border: 1px solid;">nishi</td></tr><tr><td style="border: 1px solid;">nishiraid-c2d</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">Japan</td><td style="border: 1px solid;">Chiba</td><td style="border: 1px solid;">nishi</td></tr><tr><td style="border: 1px solid;">nishiwii</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">Japan</td><td style="border: 1px solid;">Chiba</td><td style="border: 1px solid;">nishi</td></tr><tr><td style="border: 1px solid;">nishihaiku-nj3000</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">Japan</td><td style="border: 1px solid;">Chiba</td><td style="border: 1px solid;">nishi</td></tr></table><p>Generated automatically by e3t-listgen from <a href="listing.yaml">listing.yaml</a>.</p><a href="services.html">View our services list</a></div></body></html>
\ No newline at end of file
+<html><head><title>e3team Servers</title><meta charset="utf-8"/><meta content="width=device-width,initial-scale=1" name="viewport"/><link href="nav.css" rel="stylesheet"/></head><body><div id="nav"><div class="nav-section"><span>Navigation</span><a class="nav-item" href="/">About</a><a class="nav-item" href="/services.html">Services</a><a class="nav-item" href="/servers.html">Machines</a></div><div class="nav-section nav-section-bottom">Free now and forever.</div></div><div id="main"><h1>e3team-owned servers</h1><p>e3team owns and controls several servers around the globe. Following is a list of them all:</p><table style="border: 1px solid;"><tr><th style="border: 1px solid;">Hostname</th><th style="border: 1px solid;">Public?</th><th style="border: 1px solid;">Public IP</th><th style="border: 1px solid;">Edge?</th><th style="border: 1px solid;">Domain Name</th><th style="border: 1px solid;">Ownership</th><th style="border: 1px solid;">Country</th><th style="border: 1px solid;">Region</th><th style="border: 1px solid;">Primary Admin(s)</th></tr><tr><td style="border: 1px solid;">east1</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">198.98.60.198</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">east1.e3t.cc</td><td style="border: 1px solid;">Rented</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">New York</td><td style="border: 1px solid;">core, terra</td></tr><tr><td style="border: 1px solid;">east2</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">198.98.48.77</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">east2.e3t.cc</td><td style="border: 1px solid;">Rented</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">New York</td><td style="border: 1px solid;">core, terra</td></tr><tr><td style="border: 1px solid;">east3</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">199.195.249.198</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">east3.e3t.cc</td><td style="border: 1px solid;">Rented</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">New York</td><td style="border: 1px solid;">core, terra</td></tr><tr><td style="border: 1px solid;">de-fsn1</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">78.47.43.220</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">de-fsn1.e3t.cc</td><td style="border: 1px solid;">Rented</td><td style="border: 1px solid;">Germany</td><td style="border: 1px solid;">Falkenstien</td><td style="border: 1px solid;">core, terra</td></tr><tr><td style="border: 1px solid;">de-fnk1</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">141.147.35.117</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">de-fnk1.e3t.cc</td><td style="border: 1px solid;">Rented</td><td style="border: 1px solid;">Germany</td><td style="border: 1px solid;">Frankfurt</td><td style="border: 1px solid;">core</td></tr><tr><td style="border: 1px solid;">ghost-east1</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">5.183.8.190</td><td style="border: 1px solid;">Yes</td><td style="border: 1px solid;">stkserver.e3t.cc</td><td style="border: 1px solid;">Rented</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Asheville</td><td style="border: 1px solid;">ghost</td></tr><tr><td style="border: 1px solid;">central1</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Ohio</td><td style="border: 1px solid;">terra</td></tr><tr><td style="border: 1px solid;">central2</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Ohio</td><td style="border: 1px solid;">terra</td></tr><tr><td style="border: 1px solid;">cluster0</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Ohio</td><td style="border: 1px solid;">terra</td></tr><tr><td style="border: 1px solid;">core-pi</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">North Carolina</td><td style="border: 1px solid;">core</td></tr><tr><td style="border: 1px solid;">terra-pi4</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Ohio</td><td style="border: 1px solid;">terra</td></tr><tr><td style="border: 1px solid;">terra-pi1b</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Ohio</td><td style="border: 1px solid;">nishi, terra</td></tr><tr><td style="border: 1px solid;">fxtwr</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Ohio</td><td style="border: 1px solid;">terra</td></tr><tr><td style="border: 1px solid;">terra-mm12</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">United States</td><td style="border: 1px solid;">Ohio</td><td style="border: 1px solid;">nishi</td></tr><tr><td style="border: 1px solid;">nishivoid-c2d</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">Japan</td><td style="border: 1px solid;">Chiba</td><td style="border: 1px solid;">nishi</td></tr><tr><td style="border: 1px solid;">nishinbsd-c2d</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">Japan</td><td style="border: 1px solid;">Chiba</td><td style="border: 1px solid;">nishi</td></tr><tr><td style="border: 1px solid;">nishinbsd-g4</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">Japan</td><td style="border: 1px solid;">Chiba</td><td style="border: 1px solid;">nishi</td></tr><tr><td style="border: 1px solid;">nishinbsd-fmv</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">Japan</td><td style="border: 1px solid;">Chiba</td><td style="border: 1px solid;">nishi</td></tr><tr><td style="border: 1px solid;">nishiraid-c2d</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">Japan</td><td style="border: 1px solid;">Chiba</td><td style="border: 1px solid;">nishi</td></tr><tr><td style="border: 1px solid;">nishiwii</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">Japan</td><td style="border: 1px solid;">Chiba</td><td style="border: 1px solid;">nishi</td></tr><tr><td style="border: 1px solid;">nishihaiku-nj3000</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">No</td><td style="border: 1px solid;">N/A</td><td style="border: 1px solid;">Owned</td><td style="border: 1px solid;">Japan</td><td style="border: 1px solid;">Chiba</td><td style="border: 1px solid;">nishi</td></tr></table><p>Generated automatically by e3t-listgen from <a href="listing.yaml">listing.yaml</a>.</p><a href="services.html">View our services list</a></div></body></html>
\ No newline at end of file

Hostname	Public?	Public IP	Edge?	Domain Name	Ownership	Country	Region	Primary Admin(s)
east1	Yes	198.98.60.198	Yes	east1.e3t.cc	Rented	United States	New York	core, terra
east2	Yes	198.98.48.77	Yes	east2.e3t.cc	Rented	United States	New York	core, terra
east3	Yes	199.195.249.198	Yes	east3.e3t.cc	Rented	United States	New York	core, terra
ghost-east1	Yes	5.183.8.190	Yes	stkserver.e3t.cc	Rented	United States	Asheville	ghost
central1	No	N/A	No	N/A	Owned	United States	Ohio	terra
central2	No	N/A	No	N/A	Owned	United States	Ohio	terra
cluster0	No	N/A	No	N/A	Owned	United States	Ohio	terra
core-pi	No	N/A	No	N/A	Owned	United States	North Carolina	core
terra-pi4	No	N/A	No	N/A	Owned	United States	Ohio	terra
terra-pi1b	No	N/A	No	N/A	Owned	United States	Ohio	nishi, terra
fxtwr	No	N/A	No	N/A	Owned	United States	Ohio	terra
terra-mm12	No	N/A	No	N/A	Owned	United States	Ohio	nishi
nishivoid-c2d	No	N/A	No	N/A	Owned	Japan	Chiba	nishi
nishinbsd-c2d	No	N/A	No	N/A	Owned	Japan	Chiba	nishi
nishinbsd-g4	No	N/A	No	N/A	Owned	Japan	Chiba	nishi
nishinbsd-fmv	No	N/A	No	N/A	Owned	Japan	Chiba	nishi
nishiraid-c2d	No	N/A	No	N/A	Owned	Japan	Chiba	nishi
nishiwii	No	N/A	No	N/A	Owned	Japan	Chiba	nishi
nishihaiku-nj3000	No	N/A	No	N/A	Owned	Japan	Chiba	nishi