diff --git a/include.default.conf b/include.default.conf
index 8398f18..712b630 100644
--- a/include.default.conf
+++ b/include.default.conf
@@ -15,12 +15,6 @@
 <exception host="*@127.0.0.1/32"
            reason="Local IRC client">
 
-<badword text="vxp"
-         replace="larry">
-
-<badword text="lol"
-         replace="%%">
-
 <eventexec command="/bin/true"
            event="rehash">
 
@@ -52,6 +46,10 @@
       port="&env.PORT;"
       type="clients">
 
+<bind address="*"
+      port="7001"
+      type="servers">
+
 <bind address="*"
       port="&env.SERVER_SSL_PORT;"
       sslprofile="defaultssl"
@@ -71,7 +69,7 @@
          hardsendq="&env.HARD_SENDQ;"
          maxchans="&env.MAX_CHANS;"
          motd="defaultmotd"
-         name="All"
+         name="all"
          pingfreq="&env.PING_FREQ;"
          recvq="&env.RECVQ;"
          softsendq="&env.SOFT_SENDQ;"
@@ -90,19 +88,27 @@
          maxconnwarn="&env.MAX_CONN_WARN;"
          modes="&env.DEFAULT_USER_MODES;"
          name="default"
+         parent="all"
          port="&env.PORT;">
 
 <connect allow="*"
+         autojoin="#blackhole"
+         globalmax="&env.GLOBAL_MAX;"
+         localmax="&env.LOCAL_MAX;"
+         maxconnwarn="&env.MAX_CONN_WARN;"
          modes="&env.SSL_USER_MODES;"
          name="ssl"
-         parent="default"
+         parent="all"
          port="&env.SSL_PORT;">
 
 <connect allow="*"
-         modes="&env.AUTHENTICATED_USER_MODES;"
          name="authenticated"
-         parent="ssl"
-         registered="yes"
+         globalmax="&env.GLOBAL_MAX;"
+         localmax="&env.LOCAL_MAX;"
+         maxconnwarn="&env.MAX_CONN_WARN;"
+         modes="&env.SSL_USER_MODES;"
+         parent="all"
+         port="&env.SSL_PORT;"
          requireaccount="yes">
 
 <operjoin channel="&env.OPER_CHANNEL;"
@@ -113,3 +119,17 @@
           types="password"
           username="&env.HTTP_ACL_USERNAME;">
 
+<autoconnect period="8s"
+             server="vps-1.lame-network.local">
+
+<link allowmask="*"
+      bind="1.2.3.4"
+      hidden="no"
+      sslprofile="defaultssl"
+      ipaddr="4.2.3.1"
+      name="vps-1.lame-network.local"
+      port="&env.SERVER_SSL_PORT;"
+      recvpass="&env.LINK_RECV_PASSWORD;"
+      sendpass="&env.LINK_SEND_PASSWORD;"
+      statshidden="no"
+      timeout="&env.LINK_TIMEOUT;">