diff --git a/gate-traefik/make.sh b/gate-traefik/make.sh
index 9e566e0..ffad3b3 100755
--- a/gate-traefik/make.sh
+++ b/gate-traefik/make.sh
@@ -18,6 +18,7 @@ readConfig
 #----------------------------------------------------------------------
 
 DFL_ID=${DFL_ID:=101}
+# XXX revise...
 DFL_CTHOSTNAME=${GATE_HOSTNAME:=${DFL_CTHOSTNAME:=gate}}
 
 CORES=1
@@ -28,8 +29,10 @@ DRIVE=0.5
 DFL_WAN_IP=${DFL_WAN_IP}
 DFL_WAN_GATE=${DFL_WAN_GATE}
 
+# XXX revise...
 DFL_ADMIN_IP=${GATE_ADMIN_IP:=${DFL_ADMIN_IP:=10.0.0.2/24}}
 ADMIN_GATE=-
+# XXX revise...
 DFL_LAN_IP=${GATE_LAN_IP:=${DFL_LAN_IP:=10.1.1.2/24}}
 LAN_GATE=-
 
diff --git a/nextcloud/make.sh b/nextcloud/make.sh
index b031af2..8cfbd91 100755
--- a/nextcloud/make.sh
+++ b/nextcloud/make.sh
@@ -22,7 +22,7 @@ DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=nextcloud}
 
 DFL_CORES=${DFL_CORES:=2}
 DFL_RAM=${DFL_RAM:=2048}
-DFL_SWAP=${DFL_SWAP:=${DFL_RAM:=2048}}
+DFL_SWAP=${DFL_SWAP:=${DFL_RAM}}
 DFL_DRIVE=${DFL_DRIVE:=40}
 
 WAN_IP=-
@@ -70,7 +70,6 @@ sleep ${TIMEOUT:=5}
 
 tklWaitForSetup
 
-# XXX this breaks the rest of this script...
 echo "# Starting TKL UI..."
 @ lxc-attach $ID -- bash -c "HUB_APIKEY=SKIP SEC_UPDATES=SKIP /usr/sbin/turnkey-init"
 
@@ -95,9 +94,9 @@ echo "# Disabling fail2ban..."
 @ lxc-attach $ID systemctl stop fail2ban
 @ lxc-attach $ID systemctl disable fail2ban
 
-#echo "# Updating system..."
-#@ lxc-attach $ID apt update 
-#@ lxc-attach $ID apt upgrade
+echo "# Updating system..."
+@ lxc-attach $ID apt update 
+@ lxc-attach $ID -- apt upgrade -y
 
 echo "# Post config..."
 pctSet $ID "${OPTS_STAGE_2}" $REBOOT
diff --git a/ns/make.sh b/ns/make.sh
index e899d19..f274424 100755
--- a/ns/make.sh
+++ b/ns/make.sh
@@ -27,9 +27,12 @@ DRIVE=0.5
 
 WAN_IP=-
 WAN_GATE=-
+# XXX revise...
 DFL_ADMIN_IP=${DFL_ADMIN_IP:=10.0.0.1/24}
 ADMIN_GATE=-
+# XXX revise...
 DFL_LAN_IP=${NS_LAN_IP:=${DFL_LAN_IP:=10.1.1.1/24}}
+# XXX revise...
 DFL_LAN_GATE=${GATE_LAN_IP:=${DFL_LAN_GATE:=10.1.1.2}}
 DFL_LAN_GATE=${DFL_LAN_GATE/\/*}
 
diff --git a/ssh/make.sh b/ssh/make.sh
index d761d00..d189fde 100755
--- a/ssh/make.sh
+++ b/ssh/make.sh
@@ -22,7 +22,7 @@ DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=ssh}
 
 DFL_CORES=${DFL_CORES:=1}
 DFL_RAM=${DFL_RAM:=1024}
-DFL_SWAP=${DFL_SWAP:=${DFL_RAM:=1024}}
+DFL_SWAP=${DFL_SWAP:=${DFL_RAM}}
 DFL_DRIVE=${DFL_DRIVE:=16}
 
 WAN_IP=-
diff --git a/syncthing/make.sh b/syncthing/make.sh
index 54dd958..2259256 100755
--- a/syncthing/make.sh
+++ b/syncthing/make.sh
@@ -22,7 +22,7 @@ DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=syncthing}
 
 DFL_CORES=${DFL_CORES:=1}
 DFL_RAM=${DFL_RAM:=1024}
-DFL_SWAP=${DFL_SWAP:=${DFL_RAM:=1024}}
+DFL_SWAP=${DFL_SWAP:=${DFL_RAM}}
 DFL_DRIVE=${DFL_DRIVE:=8}
 
 WAN_IP=-