diff --git a/lib/en-us.toml b/lib/en-us.toml
index 167e75a..2bf476d 100644
--- a/lib/en-us.toml
+++ b/lib/en-us.toml
@@ -59,7 +59,7 @@ Use \"telebit help [command]\" for more information about a command, including f
 
 Copyright 2015-2018 AJ ONeal https://telebit.cloud MPL-2.0 Licensed (RAWR!)"
 
-status = "usage: telebit status <path/port/none> [subdomain]
+status = "usage: telebit status
 
 'telebit status' shows details about the current connections (or lack thereof).
 
diff --git a/usr/share/install-launcher.js b/usr/share/install-launcher.js
index 3935fc2..a837844 100644
--- a/usr/share/install-launcher.js
+++ b/usr/share/install-launcher.js
@@ -84,8 +84,8 @@ Launcher.install = function (things, fn) {
   };
   vars.telebitBinTpl = path.join(telebitRoot, 'usr/share/dist/bin/telebit.tpl');
   vars.telebitNpm = path.resolve(vars.telebitNode, '../npm');
-  vars.nodePath = path.resolve(vars.telebitNode, '../lib/node_modules');
-  vars.npmConfigPrefix = path.resolve(vars.telebitNode, '..');
+  vars.nodePath = path.resolve(vars.telebitNode, '../../lib/node_modules');
+  vars.npmConfigPrefix = path.resolve(vars.telebitNode, '..', '..');
   vars.userspace = (!things.telebitUser || (things.telebitUser === os.userInfo().username)) ? true : false;
   if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) {
     vars.telebitRwDirs.push(vars.npmConfigPrefix);
diff --git a/usr/share/install_helper.sh b/usr/share/install_helper.sh
index 9d819c2..e92f8ed 100644
--- a/usr/share/install_helper.sh
+++ b/usr/share/install_helper.sh
@@ -224,16 +224,20 @@ pushd $TELEBIT_TMP >/dev/null
   else
     echo -n "."
   fi
+  set +e
   $tmp_npm install >/dev/null 2>/dev/null &
-  # ursa is now an entirely optional dependency for key generation
-  # but very much needed on ARM devices
-  $tmp_npm install ursa >/dev/null 2>/dev/null &
   tmp_npm_pid=$!
   while [ -n "$tmp_npm_pid" ]; do
     sleep 2
     echo -n "."
     kill -s 0 $tmp_npm_pid >/dev/null 2>/dev/null || tmp_npm_pid=""
   done
+  set -e
+  echo -n "."
+  $tmp_npm install >/dev/null 2>/dev/null
+  # ursa is now an entirely optional dependency for key generation
+  # but very much needed on ARM devices
+  $tmp_npm install ursa >/dev/null 2>/dev/null || true
 popd >/dev/null
 
 if [ -n "${TELEBIT_DEBUG}" ]; then
@@ -425,8 +429,8 @@ if [ -d "/Library/LaunchDaemons" ]; then
 
     if [ -n "${TELEBIT_DEBUG}" ]; then
       echo "    > launchctl unload -w $my_app_launchd_service >/dev/null 2>/dev/null"
-      launchctl unload -w "$my_app_launchd_service" >/dev/null 2>/dev/null
     fi
+    launchctl unload -w "$my_app_launchd_service" >/dev/null 2>/dev/null
   else
     my_app_launchd_service_skel="usr/share/dist/Library/LaunchDaemons/${my_app_pkg_name}.plist"
     my_app_launchd_service="$my_root/Library/LaunchDaemons/${my_app_pkg_name}.plist"
diff --git a/usr/share/template-launcher.js b/usr/share/template-launcher.js
index 124766f..9c0f259 100644
--- a/usr/share/template-launcher.js
+++ b/usr/share/template-launcher.js
@@ -79,8 +79,8 @@ function run() {
     , TELEBIT_LOG_DIR: process.env.TELEBIT_LOG_DIR || path.join(os.homedir(), '.local/share/telebit/var/log')
     };
     vars.telebitNpm = process.env.TELEBIT_NPM || path.resolve(vars.telebitNode, '../npm');
-    vars.nodePath = process.env.NODE_PATH || path.resolve(vars.telebitNode, '../lib/node_modules');
-    vars.npmConfigPrefix = process.env.NPM_CONFIG_PREFIX || path.resolve(vars.telebitNode, '..');
+    vars.nodePath = process.env.NODE_PATH || path.resolve(vars.telebitNode, '../../lib/node_modules');
+    vars.npmConfigPrefix = process.env.NPM_CONFIG_PREFIX || path.resolve(vars.telebitNode, '..', '..');
     if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) {
       vars.telebitRwDirs.push(vars.npmConfigPrefix);
     }