diff --git a/gen_tdp b/gen_tdp
index 457d451..87c516b 100755
--- a/gen_tdp
+++ b/gen_tdp
@@ -1,40 +1,39 @@
 #!/usr/bin/env python3
-import subprocess,json,os.path,requests
+import subprocess, json, os.path, requests
 from bs4 import BeautifulSoup as bs
 
 tdp = {}
 tdp["name"] = "tilde.team"
 tdp["url"] = "https://tilde.team"
-tdp["signup_url"] = tdp["url"]+"/signup"
-users = subprocess.check_output(["/usr/bin/members","team"]).decode('ascii').split()
+tdp["signup_url"] = tdp["url"] + "/signup/"
+users = subprocess.check_output(["/usr/bin/members", "team"]).decode("ascii").split()
 users.sort()
-tdp["user_count"] = len(users)-1
+tdp["user_count"] = len(users)
 tdp["want_users"] = True
 tdp["admin_email"] = "sudoers@tilde.team"
 tdp["description"] = "a digital community for socializing, learning, and making cool stuff, tilde.team is a shared system that provides a radically inclusive, non-commercial space for teaching, learning, practicing and enjoying the social medium of unix."
 tdpusers = []
+
 for user in users:
-	if user=="asm":
-		continue
-	tdpuser = dict(username=user)
-	try:
-		title = bs(requests.get("https://tilde.team/~{}".format(user)).text,"lxml").title
-	except:
-		if user=="ahriman": pass
-		else: raise
-	if title is None:
-		title = "No title"
-	else:
-		title = title.text
-	tdpuser["title"] = title
-	if os.path.exists(os.path.expanduser("~{}/public_html/index.html".format(user))):
-		tdpuser["mtime"] = os.path.getmtime(os.path.expanduser("~{}/public_html/index.html".format(user)))
-	elif os.path.exists(os.path.expanduser("~{}/public_html/index.htm".format(user))):
-		tdpuser["mtime"] = os.path.getmtime(os.path.expanduser("~{}/public_html/index.htm".format(user)))
-	elif os.path.exists(os.path.expanduser("~{}/public_html/index.php".format(user))):
-		tdpuser["mtime"] = os.path.getmtime(os.path.expanduser("~{}/public_html/index.php".format(user)))
-	tdpusers.append(tdpuser)
+    tdpuser = dict(username=user)
+    try:
+        title = bs(
+            requests.get(f"https://tilde.team/~{user}/", allow_redirects=False).text,
+            "lxml",
+        ).title.text
+    except:
+        title = "No title"
+    tdpuser["title"] = title
+
+    if os.path.exists(f"/home/{user}/public_html/index.html"):
+        tdpuser["mtime"] = os.path.getmtime(f"/home/{user}/public_html/index.html")
+    elif os.path.exists(f"/home/{user}/public_html/index.cgi"):
+        tdpuser["mtime"] = os.path.getmtime(f"/home/{user}/public_html/index.cgi")
+    elif os.path.exists(f"/home/{user}/public_html/index.php"):
+        tdpuser["mtime"] = os.path.getmtime(f"/home/{user}/public_html/index.php")
+
+    tdpusers.append(tdpuser)
 tdp["users"] = tdpusers
 
-with open("tilde.json","w") as f:
-	json.dump(tdp,f)
+with open("tilde.json", "w") as f:
+    json.dump(tdp, f)