diff --git a/Birders_Guide_Installer.sh b/Birders_Guide_Installer.sh
index eec2292..b336f95 100755
--- a/Birders_Guide_Installer.sh
+++ b/Birders_Guide_Installer.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 my_dir=${HOME}/BirdNET-Pi
-branch=testing
+branch=newinstaller
 trap '${my_dir}/scripts/dump_logs.sh && exit' EXIT SIGHUP SIGINT
 
 
@@ -47,21 +47,6 @@ EOF
   cd ~
   curl -s -O "https://raw.githubusercontent.com/mcguirepr89/BirdNET-Pi/${branch}/Birders_Guide_Installer.sh"
   chmod +x Birders_Guide_Installer.sh
-  cat << EOF | sudo tee /etc/systemd/user/birdnet-system-installer.service &> /dev/null
-[Unit]
-Description=A BirdNET-Pi Installation Script Service
-After=graphical.target network-online.target
-
-[Service]
-Type=simple
-Restart=on-failure
-RestartSec=3s
-ExecStart=lxterminal -e /home/pi/Birders_Guide_Installer.sh
-
-[Install]
-WantedBy=default.target
-EOF
-  systemctl --user enable birdnet-system-installer.service
   echo
   echo "Stage 1 complete"
   touch ${HOME}/stage_1_complete
@@ -119,10 +104,10 @@ stage_2() {
     echo "Follow the instructions to fill out the LATITUDE and LONGITUDE variables
 and set the passwords for the live audio stream. Save the file after editing
 and then close the Mouse Pad editing window to continue."
-    if ( env | grep SSH_CONNECTION &> /dev/null );then
-      editor=nano
-    else
+    if [ -z $SSH_CONNECTION ];then
       editor=mousepad
+    else
+      editor=nano
     fi
     $editor ${my_dir}/Birders_Guide_Installer_Configuration.txt
     while pgrep $editor &> /dev/null;do
diff --git a/scripts/birdnet-pi-config b/scripts/birdnet-pi-config
index b6e5a9c..bf62f53 100755
--- a/scripts/birdnet-pi-config
+++ b/scripts/birdnet-pi-config
@@ -5,7 +5,7 @@
 # See LICENSE file for copyright and license details
 # Copyright (c) 2012 Alex Bradbury <asb@asbradbury.org>
 
-my_dir=$(realpath $(dirname $0))
+branch=newinstaller
 INTERACTIVE=True
 ASK_TO_REBOOT=0
 BLACKLIST=/etc/modprobe.d/raspi-blacklist.conf
@@ -718,7 +718,7 @@ do_update() {
 }
 
 do_install_birdnet() {
-  ${my_dir}/Birders_Guide_Installer.sh
+  curl -s "https://raw.githubusercontent.com/mcguirepr89/BirdNET-Pi/${branch}/Birders_Guide_Installer.sh" | bash
   ASK_TO_REBOOT=1
 }
 
diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh
index 9cd8ce5..c6033fc 100755
--- a/scripts/uninstall.sh
+++ b/scripts/uninstall.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 # Uninstall script to remove everything
-# set -x # Uncomment to debug
+#set -x # Uncomment to debug
 trap 'rm -f ${TMPFILE}' EXIT
+my_dir=/home/pi/BirdNET-Pi/scripts
 source /etc/birdnet/birdnet.conf &> /dev/null
 SCRIPTS=(birdnet_analysis.sh
 birdnet_recording.sh
@@ -44,8 +45,8 @@ tmux
 uninstall.sh
 update_species.sh
 ${HOME}/.gotty)
-
-services=$(awk '/service/ && /systemctl/ && !/php/ {print $3}' ${my_dir}/install_services.sh | sort)
+set -x
+services=($(awk '/service/ && /systemctl/ && !/php/ {print $3}' ${my_dir}/install_services.sh | sort))
 
 remove_services() {
   for i in "${services[@]}"; do
@@ -59,6 +60,7 @@ remove_services() {
       sudo rm -drf /etc/systemd/system/"${i}"
     fi
   done
+  set +x
   remove_icecast
   remove_crons
 }