diff --git a/bin/dm-list-experiment-files b/bin/dm-list-experiment-files
new file mode 120000
index 0000000000000000000000000000000000000000..7cc8f6925ff75ec19138d5c536b9ecacec8f298c
--- /dev/null
+++ b/bin/dm-list-experiment-files
@@ -0,0 +1 @@
+dm-get-experiment-files
\ No newline at end of file
diff --git a/bin/dm-list-experiments b/bin/dm-list-experiments
new file mode 120000
index 0000000000000000000000000000000000000000..c5daa5af70c1c5e071f0e11b19a6335549fd4254
--- /dev/null
+++ b/bin/dm-list-experiments
@@ -0,0 +1 @@
+dm-get-experiments
\ No newline at end of file
diff --git a/bin/dm-list-users b/bin/dm-list-users
new file mode 120000
index 0000000000000000000000000000000000000000..61cd44b67199a6cb1e7095fd92c6fcf646b397e0
--- /dev/null
+++ b/bin/dm-list-users
@@ -0,0 +1 @@
+dm-get-users
\ No newline at end of file
diff --git a/etc/init.d/dm-mongo-express b/etc/init.d/dm-mongo-express
index 2ce9d9ed9ecf3809347fb67ddfe967425d6115f2..b47d5b5448260472d9663676198d41e4516c845b 100755
--- a/etc/init.d/dm-mongo-express
+++ b/etc/init.d/dm-mongo-express
@@ -110,7 +110,9 @@ stop() {
     fi
     echo -n $"Stopping $DM_DAEMON_NAME daemon: "
     PID=`cat $DM_DAEMON_PID_FILE`
-    $DM_DAEMON_CMD stop $PID
+    # forever currently cannot seem to stop node apps
+    #$DM_DAEMON_CMD stop $PID
+    killall -KILL node    
     RETVAL=$?
     [ $RETVAL -eq 0 ] && rm -f $DM_DAEMON_PID_FILE && success $"$DM_DAEMON_NAME shutdown" || failure $"$DM_DAEMON_NAME shutdown"
     echo
diff --git a/src/python/dm/aps_bss/impl/bssClient.py b/src/python/dm/aps_bss/impl/bssClient.py
index 1dfe582cea692f4d36c850eb53d0e3ee3e0bc001..dc81e6f418f07e15842e9c2f602ca7805cb5c294 100644
--- a/src/python/dm/aps_bss/impl/bssClient.py
+++ b/src/python/dm/aps_bss/impl/bssClient.py
@@ -95,14 +95,15 @@ class BssClient:
         experimenters = []
         for experimenter in experimenterArray:
             user = ApsUserInfo({
-                'id' : experimenter.id,
-                'email' : experimenter.email,
+                'id' : experimenter.id
             })
             if hasattr(experimenter, 'badge'):
                 user['badge'] = experimenter.badge
             else:
                 # Ignore this user, has no badge
                 continue
+            if hasattr(experimenter, 'email'):
+                user['email'] = experimenter.email
             if hasattr(experimenter, 'piFlag'):
                 user['piFlag'] = experimenter.piFlag
             if hasattr(experimenter, 'instId'):