diff --git a/wiki/pages/domains.md b/wiki/pages/domains.md
index 5788a0b..62c6201 100644
--- a/wiki/pages/domains.md
+++ b/wiki/pages/domains.md
@@ -25,7 +25,6 @@ because [~ben](https://tilde.team/~ben/) hoards domain names, the following doma
 * [tilderadio.org](https://tilderadio.org/) - tildeverse radio
 * [tildeteam.net](https://tildeteam.net/) - alias
 * [tildeteam.org](https://tildeteam.org/) - alias
-* [tildenet.org](http://tildenet.org/) - redirect to tilde.chat *note*: this is tentatively planned to be decommissioned
 * [tildeverse.net](https://tildeverse.net/) - the tildeverse! (registered due to impending .org price hikes)
 * [tildeverse.org](https://tildeverse.org/) - the tildeverse!
 
diff --git a/wiki/pages/email.md b/wiki/pages/email.md
index b0c923e..34e3010 100644
--- a/wiki/pages/email.md
+++ b/wiki/pages/email.md
@@ -17,41 +17,53 @@ tilde.team has a mailserver. here are your options:
 - alpine - should work out of the box
 - [webmail](https://mail.tilde.team)
 - imap/smtp
+  - some clients will autoconfigure (tested with thunderbird)
   - email address: username@tilde.team (or any of the aliased [domains](domains))
   - username: username (without the domain)
   - password: your shell password
-  - imap: imap.tilde.team port 143 (starttls)
-  - pop3: pop3.tilde.team port 995 (tls)
-  - smtp: smtp.tilde.team port 587 (starttls)
-  - (any subdomain of tilde.team works for smtp, pop3, and imap. just make sure you have tls selected)
-  - some clients will autoconfigure (tested with thunderbird)
+  - port info:
+    - imap: imap.tilde.team port 143 (starttls)
+    - imaps: imap.tilde.team port 993 (tls)
+    - pop3: pop3.tilde.team port 995 (tls)
+    - smtp: smtp.tilde.team port 587 (starttls)
+    - smtps: smtp.tilde.team port 465 (tls)
 
 ### alternate domains and addresses
 
-because [~ben](https://tilde.team/~ben/) hoards domain names, you can use any of the [domains on this list](domains) with your tildemail:
+because [~ben](https://tilde.team/~ben/) hoards domain names, you can 
+use any of the [domains on this list](domains) with your tildemail:
 
-mail sent to yourusername@ any of those domains will end up in your inbox. most clients will allow you to add additional identities/aliases.
+mail sent to yourusername@ any of those domains will end up in your 
+inbox. most clients will allow you to add additional identities/aliases.
 
-additionally, any address with a `+` and arbitrary text behind it will be forwarded to you email: ie. `your_username+somethingcool@tildeteam.org`.
-feel free to use as many as you'd like :)
+additionally, any address with a `+` and arbitrary text behind it 
+will be forwarded to your email: ie. `yourusername+somethingcool@tildeteam.org`.
+plus-addresses are very useful for filtering mail.
 
 ### forwarding and sieve
 
-if you would like your tildemail to be forwarded somewhere else, put that email address in ~/.forward
+if you would like your tildemail to be forwarded somewhere else, put that 
+email address in a file called `~/.forward`
 
 ```bash
 echo myotheraddress@example.com > ~/.forward
 ```
 
-we also have [sieve](http://sieve.info) and [managesieve](https://wiki1.dovecot.org/ManageSieve) support.
+we also have [sieve](http://sieve.info) and 
+[managesieve](https://wiki1.dovecot.org/ManageSieve) support.
 
-scripts belong in `~/sieve/`, with the active sieve script in `~/.dovecot.sieve` (to conform with managesieve).
+scripts belong in `~/sieve/`, with the active sieve script 
+named `~/.dovecot.sieve` (to conform with managesieve).
 
-here are some [example sieve scripts](https://wiki.dovecot.org/Pigeonhole/Sieve/Examples)
+here are some [example sieve scripts](
+https://wiki.dovecot.org/Pigeonhole/Sieve/Examples)
 
-managesieve is available on the default port (4190) if you want to use an external managesieve client (like the [thunderbird add-on](https://github.com/thsmi/sieve)).
+managesieve is available on the default port (4190) if you want 
+to use an external managesieve client (like the [thunderbird add-on](
+https://github.com/thsmi/sieve)).
 
-[webmail](https://mail.tilde.team) is pre-configured to work with your local sieve scripts.
+[our webmail](https://mail.tilde.team/#/settings/filters) is pre-configured 
+to manage your sieve scripts.
 
 ---
 
diff --git a/wiki/pages/irc.md b/wiki/pages/irc.md
index 09cb6ba..0623d5c 100644
--- a/wiki/pages/irc.md
+++ b/wiki/pages/irc.md
@@ -11,9 +11,13 @@ category:
 
 hi teammates!
 
-the tilde.chat irc network is available at irc.tilde.chat:6697 (with ssl) as a round robin of 
+the tilde.chat irc network is available publicly at irc.tilde.chat:6697 (with ssl) as a round robin of 
 [available nodes](https://tilde.chat/wiki/?page=servers).
 
+to connect directly to our node, you can use the following addresses:
+- localhost port 6667 when at your shell or via ssh port-forwarding
+- team.tilde.chat port 6697 with ssl
+
 this is the beginning of the [tilde.chat](https://tilde.chat) irc federation! more info on that site.
 
 ## here are some options to connect:
@@ -24,9 +28,6 @@ this is the beginning of the [tilde.chat](https://tilde.chat) irc federation! mo
   then log in with your shell password and configure as needed
 * run `webirc` to register your thelounge account for [our webchat](https://irc.tilde.team)
   note that thelounge does not authenticate with your shell password.
-* any other client that you like: connect to our node at team.tilde.chat:6697 with ssl
-
-local connections (weechat, irssi, znc) can use 6667 without ssl
 
 ## weechat relays