diff --git a/extras/vpnupgrade_Libreswan.sh b/extras/vpnupgrade_Libreswan.sh
index 4640292..9c50c6e 100644
--- a/extras/vpnupgrade_Libreswan.sh
+++ b/extras/vpnupgrade_Libreswan.sh
@@ -10,8 +10,8 @@
 # Attribution required: please include my name in any derivative and let me
 # know how you have improved it!
 
-# Check https://libreswan.org for the latest version
-SWAN_VER=3.17
+# Check for the latest version at https://libreswan.org and update as necessary
+swan_ver=3.17
 
 ### Do not edit below this line
 
@@ -35,15 +35,20 @@ if [ "$(id -u)" != 0 ]; then
   exit 1
 fi
 
-/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "Libreswan"
-if [ "$?" != "0" ]; then
-  echoerr "This upgrade script requires Libreswan already installed."
+if [ -z "$swan_ver" ]; then
+  echoerr "Libreswan version 'swan_ver' not specified. Aborting."
   exit 1
 fi
 
-/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "Libreswan $SWAN_VER"
+/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "Libreswan"
+if [ "$?" != "0" ]; then
+  echoerr "This script requires Libreswan already installed. Aborting."
+  exit 1
+fi
+
+/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "Libreswan $swan_ver"
 if [ "$?" = "0" ]; then
-  echo "You already have Libreswan version $SWAN_VER installed! "
+  echo "You already have Libreswan version $swan_ver installed! "
   echo "If you continue, the same version will be re-installed."
   echo
   printf "Do you wish to continue anyway? [y/N] "
@@ -62,7 +67,7 @@ fi
 clear
 
 cat <<EOF
-Welcome! This script will build and install Libreswan $SWAN_VER on your server.
+Welcome! This script will build and install Libreswan $swan_ver on your server.
 Additional packages required for Libreswan compilation will also be installed.
 
 This is intended for use on servers running an older version of Libreswan.
@@ -70,10 +75,10 @@ Your existing VPN configuration files will NOT be modified.
 
 EOF
 
-if [ "$(sed 's/\..*//' /etc/debian_version)" = "7" ]; then
+if [ "$(sed 's/\..*//' /etc/debian_version 2>/dev/null)" = "7" ]; then
 cat <<'EOF'
 IMPORTANT: Workaround required for Debian 7 (Wheezy).
-First, run the script at: https://git.io/vpndebian7
+You must first run the script at: https://git.io/vpndeb7
 Continue only after completing this workaround.
 
 EOF
@@ -110,28 +115,28 @@ apt-get -yq install libnss3-dev libnspr4-dev pkg-config libpam0g-dev \
 apt-get -yq --no-install-recommends install xmlto
 
 # Compile and install Libreswan
-swan_file="libreswan-${SWAN_VER}.tar.gz"
+swan_file="libreswan-${swan_ver}.tar.gz"
 swan_url1="https://download.libreswan.org/$swan_file"
-swan_url2="https://github.com/libreswan/libreswan/archive/v${SWAN_VER}.tar.gz"
+swan_url2="https://github.com/libreswan/libreswan/archive/v${swan_ver}.tar.gz"
 wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url1" || wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url2"
 [ "$?" != "0" ] && { echoerr "Cannot download Libreswan source. Aborting."; exit 1; }
-/bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
+/bin/rm -rf "/opt/src/libreswan-$swan_ver"
 tar xzf "$swan_file" && /bin/rm -f "$swan_file"
-cd "libreswan-$SWAN_VER" || { echoerr "Cannot enter Libreswan source dir. Aborting."; exit 1; }
+cd "libreswan-$swan_ver" || { echoerr "Cannot enter Libreswan source dir. Aborting."; exit 1; }
 echo "WERROR_CFLAGS =" > Makefile.inc.local
 make -s programs && make -s install
 
 # Verify the install and clean up
 cd /opt/src || exit 1
-/bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
-/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "$SWAN_VER"
-[ "$?" != "0" ] && { echoerr; echoerr "Libreswan $SWAN_VER failed to build. Aborting."; exit 1; }
+/bin/rm -rf "/opt/src/libreswan-$swan_ver"
+/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "$swan_ver"
+[ "$?" != "0" ] && { echoerr; echoerr "Libreswan $swan_ver failed to build. Aborting."; exit 1; }
 
 # Restart IPsec service
 service ipsec restart
 
 echo
-echo "Libreswan $SWAN_VER was installed successfully! "
+echo "Libreswan $swan_ver was installed successfully! "
 echo
 
 exit 0
diff --git a/extras/vpnupgrade_Libreswan_centos.sh b/extras/vpnupgrade_Libreswan_centos.sh
index 477be17..d8ecfc3 100644
--- a/extras/vpnupgrade_Libreswan_centos.sh
+++ b/extras/vpnupgrade_Libreswan_centos.sh
@@ -10,8 +10,8 @@
 # Attribution required: please include my name in any derivative and let me
 # know how you have improved it!
 
-# Check https://libreswan.org for the latest version
-SWAN_VER=3.17
+# Check for the latest version at https://libreswan.org and update as necessary
+swan_ver=3.17
 
 ### Do not edit below this line
 
@@ -39,15 +39,20 @@ if [ "$(id -u)" != 0 ]; then
   exit 1
 fi
 
-/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "Libreswan"
-if [ "$?" != "0" ]; then
-  echoerr "This upgrade script requires Libreswan already installed."
+if [ -z "$swan_ver" ]; then
+  echoerr "Libreswan version 'swan_ver' not specified. Aborting."
   exit 1
 fi
 
-/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "Libreswan $SWAN_VER"
+/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "Libreswan"
+if [ "$?" != "0" ]; then
+  echoerr "This script requires Libreswan already installed. Aborting."
+  exit 1
+fi
+
+/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "Libreswan $swan_ver"
 if [ "$?" = "0" ]; then
-  echo "You already have Libreswan version $SWAN_VER installed! "
+  echo "You already have Libreswan version $swan_ver installed! "
   echo "If you continue, the same version will be re-installed."
   echo
   printf "Do you wish to continue anyway? [y/N] "
@@ -66,7 +71,7 @@ fi
 clear
 
 cat <<EOF
-Welcome! This script will build and install Libreswan $SWAN_VER on your server.
+Welcome! This script will build and install Libreswan $swan_ver on your server.
 Additional packages required for Libreswan compilation will also be installed.
 
 This is intended for use on servers running an older version of Libreswan.
@@ -115,22 +120,22 @@ elif grep -qs "release 7" /etc/redhat-release; then
 fi
 
 # Compile and install Libreswan
-swan_file="libreswan-${SWAN_VER}.tar.gz"
+swan_file="libreswan-${swan_ver}.tar.gz"
 swan_url1="https://download.libreswan.org/$swan_file"
-swan_url2="https://github.com/libreswan/libreswan/archive/v${SWAN_VER}.tar.gz"
+swan_url2="https://github.com/libreswan/libreswan/archive/v${swan_ver}.tar.gz"
 wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url1" || wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url2"
 [ "$?" != "0" ] && { echoerr "Cannot download Libreswan source. Aborting."; exit 1; }
-/bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
+/bin/rm -rf "/opt/src/libreswan-$swan_ver"
 tar xzf "$swan_file" && /bin/rm -f "$swan_file"
-cd "libreswan-$SWAN_VER" || { echoerr "Cannot enter Libreswan source dir. Aborting."; exit 1; }
+cd "libreswan-$swan_ver" || { echoerr "Cannot enter Libreswan source dir. Aborting."; exit 1; }
 echo "WERROR_CFLAGS =" > Makefile.inc.local
 make -s programs && make -s install
 
 # Verify the install and clean up
 cd /opt/src || exit 1
-/bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
-/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "$SWAN_VER"
-[ "$?" != "0" ] && { echoerr; echoerr "Libreswan $SWAN_VER failed to build. Aborting."; exit 1; }
+/bin/rm -rf "/opt/src/libreswan-$swan_ver"
+/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "$swan_ver"
+[ "$?" != "0" ] && { echoerr; echoerr "Libreswan $swan_ver failed to build. Aborting."; exit 1; }
 
 # Restore SELinux contexts
 restorecon /etc/ipsec.d/*db 2>/dev/null
@@ -141,7 +146,7 @@ restorecon /usr/local/libexec/ipsec -Rv 2>/dev/null
 service ipsec restart
 
 echo
-echo "Libreswan $SWAN_VER was installed successfully! "
+echo "Libreswan $swan_ver was installed successfully! "
 echo
 
 exit 0
diff --git a/vpnsetup.sh b/vpnsetup.sh
index e8c973d..848f890 100755
--- a/vpnsetup.sh
+++ b/vpnsetup.sh
@@ -15,7 +15,7 @@
 # Attribution required: please include my name in any derivative and let me
 # know how you have improved it!
 
-# ===========================================================
+# =====================================================
 
 # Define your own values for these variables
 # - IPsec pre-shared key, VPN username and password
@@ -29,10 +29,7 @@ YOUR_PASSWORD=''
 # Important Notes:   https://git.io/vpnnotes
 # Setup VPN Clients: https://git.io/vpnclients
 
-# ===========================================================
-
-# Check https://libreswan.org for the latest version
-SWAN_VER=3.17
+# =====================================================
 
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
@@ -59,8 +56,8 @@ if [ -z "$eth0_state" ] || [ "$eth0_state" = "down" ]; then
 cat 1>&2 <<'EOF'
 Network interface 'eth0' is not available. Aborting.
 
-Run 'cat /proc/net/dev' to find the name of the active network interface,
-then search and replace ALL 'eth0' and 'eth+' in this script with that name.
+Run 'cat /proc/net/dev' to find the active network interface,
+then use it to replace ALL 'eth0' and 'eth+' in this script.
 EOF
 exit 1
 fi
@@ -82,10 +79,10 @@ if [ -z "$VPN_IPSEC_PSK" ] || [ -z "$VPN_USER" ] || [ -z "$VPN_PASSWORD" ]; then
   exit 1
 fi
 
-if [ "$(sed 's/\..*//' /etc/debian_version)" = "7" ]; then
+if [ "$(sed 's/\..*//' /etc/debian_version 2>/dev/null)" = "7" ]; then
 cat <<'EOF'
 IMPORTANT: Workaround required for Debian 7 (Wheezy).
-First, run the script at: https://git.io/vpndebian7
+You must first run the script at: https://git.io/vpndeb7
 If not already done so, press Ctrl-C to interrupt now.
 
 Pausing for 60 seconds...
@@ -94,8 +91,10 @@ EOF
 sleep 60
 fi
 
-echo "VPN setup in progress... Please be patient."
-echo
+cat <<'EOF'
+VPN setup in progress... Please be patient.
+
+EOF
 
 # Create and change to working dir
 mkdir -p /opt/src
@@ -156,22 +155,23 @@ apt-get -yq install xl2tpd
 apt-get -yq install fail2ban
 
 # Compile and install Libreswan
-swan_file="libreswan-${SWAN_VER}.tar.gz"
+swan_ver=3.17
+swan_file="libreswan-${swan_ver}.tar.gz"
 swan_url1="https://download.libreswan.org/$swan_file"
-swan_url2="https://github.com/libreswan/libreswan/archive/v${SWAN_VER}.tar.gz"
+swan_url2="https://github.com/libreswan/libreswan/archive/v${swan_ver}.tar.gz"
 wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url1" || wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url2"
 [ "$?" != "0" ] && { echoerr "Cannot download Libreswan source. Aborting."; exit 1; }
-/bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
+/bin/rm -rf "/opt/src/libreswan-$swan_ver"
 tar xzf "$swan_file" && /bin/rm -f "$swan_file"
-cd "libreswan-$SWAN_VER" || { echoerr "Cannot enter Libreswan source dir. Aborting."; exit 1; }
+cd "libreswan-$swan_ver" || { echoerr "Cannot enter Libreswan source dir. Aborting."; exit 1; }
 echo "WERROR_CFLAGS =" > Makefile.inc.local
 make -s programs && make -s install
 
 # Verify the install and clean up
 cd /opt/src || exit 1
-/bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
-/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "$SWAN_VER"
-[ "$?" != "0" ] && { echoerr; echoerr "Libreswan $SWAN_VER failed to build. Aborting."; exit 1; }
+/bin/rm -rf "/opt/src/libreswan-$swan_ver"
+/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "$swan_ver"
+[ "$?" != "0" ] && { echoerr; echoerr "Libreswan $swan_ver failed to build. Aborting."; exit 1; }
 
 # Create IPsec (Libreswan) config
 sys_dt="$(date +%Y-%m-%d-%H:%M:%S)"
@@ -444,7 +444,7 @@ EOF
 fi
 
 # Reload sysctl.conf
-sysctl -q -p 2>/dev/null
+sysctl -e -q -p
 
 # Update file attributes
 chmod +x /etc/rc.local
diff --git a/vpnsetup_centos.sh b/vpnsetup_centos.sh
index b1d2e15..e156cb1 100755
--- a/vpnsetup_centos.sh
+++ b/vpnsetup_centos.sh
@@ -15,7 +15,7 @@
 # Attribution required: please include my name in any derivative and let me
 # know how you have improved it!
 
-# ===========================================================
+# =====================================================
 
 # Define your own values for these variables
 # - IPsec pre-shared key, VPN username and password
@@ -29,10 +29,7 @@ YOUR_PASSWORD=''
 # Important Notes:   https://git.io/vpnnotes
 # Setup VPN Clients: https://git.io/vpnclients
 
-# ===========================================================
-
-# Check https://libreswan.org for the latest version
-SWAN_VER=3.17
+# =====================================================
 
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
@@ -63,8 +60,8 @@ if [ -z "$eth0_state" ] || [ "$eth0_state" = "down" ]; then
 cat 1>&2 <<'EOF'
 Network interface 'eth0' is not available. Aborting.
 
-Run 'cat /proc/net/dev' to find the name of the active network interface,
-then search and replace ALL 'eth0' and 'eth+' in this script with that name.
+Run 'cat /proc/net/dev' to find the active network interface,
+then use it to replace ALL 'eth0' and 'eth+' in this script.
 EOF
 exit 1
 fi
@@ -86,8 +83,10 @@ if [ -z "$VPN_IPSEC_PSK" ] || [ -z "$VPN_USER" ] || [ -z "$VPN_PASSWORD" ]; then
   exit 1
 fi
 
-echo "VPN setup in progress... Please be patient."
-echo
+cat <<'EOF'
+VPN setup in progress... Please be patient.
+
+EOF
 
 # Create and change to working dir
 mkdir -p /opt/src
@@ -161,22 +160,23 @@ elif grep -qs "release 7" /etc/redhat-release; then
 fi
 
 # Compile and install Libreswan
-swan_file="libreswan-${SWAN_VER}.tar.gz"
+swan_ver=3.17
+swan_file="libreswan-${swan_ver}.tar.gz"
 swan_url1="https://download.libreswan.org/$swan_file"
-swan_url2="https://github.com/libreswan/libreswan/archive/v${SWAN_VER}.tar.gz"
+swan_url2="https://github.com/libreswan/libreswan/archive/v${swan_ver}.tar.gz"
 wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url1" || wget -t 3 -T 30 -nv -O "$swan_file" "$swan_url2"
 [ "$?" != "0" ] && { echoerr "Cannot download Libreswan source. Aborting."; exit 1; }
-/bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
+/bin/rm -rf "/opt/src/libreswan-$swan_ver"
 tar xzf "$swan_file" && /bin/rm -f "$swan_file"
-cd "libreswan-$SWAN_VER" || { echoerr "Cannot enter Libreswan source dir. Aborting."; exit 1; }
+cd "libreswan-$swan_ver" || { echoerr "Cannot enter Libreswan source dir. Aborting."; exit 1; }
 echo "WERROR_CFLAGS =" > Makefile.inc.local
 make -s programs && make -s install
 
 # Verify the install and clean up
 cd /opt/src || exit 1
-/bin/rm -rf "/opt/src/libreswan-$SWAN_VER"
-/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "$SWAN_VER"
-[ "$?" != "0" ] && { echoerr; echoerr "Libreswan $SWAN_VER failed to build. Aborting."; exit 1; }
+/bin/rm -rf "/opt/src/libreswan-$swan_ver"
+/usr/local/sbin/ipsec --version 2>/dev/null | grep -qs "$swan_ver"
+[ "$?" != "0" ] && { echoerr; echoerr "Libreswan $swan_ver failed to build. Aborting."; exit 1; }
 
 # Create IPsec (Libreswan) config
 sys_dt="$(date +%Y-%m-%d-%H:%M:%S)"
@@ -448,7 +448,7 @@ restorecon /usr/local/sbin -Rv 2>/dev/null
 restorecon /usr/local/libexec/ipsec -Rv 2>/dev/null
 
 # Reload sysctl.conf
-sysctl -q -p 2>/dev/null
+sysctl -e -q -p
 
 # Update file attributes
 chmod +x /etc/rc.local