diff --git a/install.sh b/install.sh
index 9be99f8..49dbce7 100644
--- a/install.sh
+++ b/install.sh
@@ -112,11 +112,11 @@ if [ ! -d "/opt/rustdesk" ]; then
     sudo mkdir -p /opt/rustdesk/
 fi
 sudo chown "${uname}" -R /opt/rustdesk
-cd /opt/rustdesk/
+cd /opt/rustdesk/ || exit 1
 
 #Download latest version of Rustdesk
 RDLATEST=$(curl https://api.github.com/repos/rustdesk/rustdesk-server/releases/latest -s | grep "tag_name"| awk '{print substr($2, 2, length($2)-3) }')
-sudo wget "https://github.com/rustdesk/rustdesk-server/releases/download/${RDLATEST}/rustdesk-server-linux-x64.zip"
+wget "https://github.com/rustdesk/rustdesk-server/releases/download/${RDLATEST}/rustdesk-server-linux-x64.zip"
 unzip rustdesk-server-linux-x64.zip
 
 # Make Folder /var/log/rustdesk/
@@ -207,7 +207,7 @@ fi
 sudo chown "${uname}" -R /opt/gohttp
 cd /opt/gohttp
 GOHTTPLATEST=$(curl https://api.github.com/repos/codeskyblue/gohttpserver/releases/latest -s | grep "tag_name"| awk '{print substr($2, 2, length($2)-3) }')
-sudo wget "https://github.com/codeskyblue/gohttpserver/releases/download/${GOHTTPLATEST}/gohttpserver_${GOHTTPLATEST}_linux_amd64.tar.gz"
+wget "https://github.com/codeskyblue/gohttpserver/releases/download/${GOHTTPLATEST}/gohttpserver_${GOHTTPLATEST}_linux_amd64.tar.gz"
 tar -xf  gohttpserver_${GOHTTPLATEST}_linux_amd64.tar.gz
 
 # Copy Rustdesk install scripts to folder
@@ -221,7 +221,7 @@ if [ ! -d "/var/log/gohttp" ]; then
 fi
 sudo chown "${uname}" -R /var/log/gohttp/
 
-sudo rm gohttpserver_${GOHTTPLATEST}_linux_amd64.tar.gz
+rm gohttpserver_"${GOHTTPLATEST}"_linux_amd64.tar.gz
 
 # Setup Systemd to launch Go HTTP Server
 gohttpserver="$(cat << EOF
diff --git a/linuxclientinstall.sh b/linuxclientinstall.sh
index a0f2d0d..23ca03a 100644
--- a/linuxclientinstall.sh
+++ b/linuxclientinstall.sh
@@ -36,6 +36,7 @@ else
     # Fall back to uname, e.g. "Linux <version>", also works for BSD, etc.
     OS=$(uname -s)
     VER=$(uname -r)
+fi
 
 # Install Rustdesk
 case ${OS,,} in
@@ -98,7 +99,7 @@ chown ${uname}:${uname} /home/${uname}/.config/rustdesk/RustDesk2.toml
 
 systemctl restart rustdesk
 
-echo "ID & Password for Rustdesk $(uname} are:"
+echo "ID & Password for Rustdesk ${uname} are:"
 grep -w id /home/${uname}/.config/rustdesk/RustDesk.toml
 grep -w password /home/${uname}/.config/rustdesk/RustDesk.toml
 
diff --git a/update.sh b/update.sh
index 88f1f22..83fe47b 100644
--- a/update.sh
+++ b/update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Get Username
-uname=$(whoami)
+uname=$(whoami) # not used btw .. yet
 
 sudo systemctl stop gohttpserver.service
 sudo systemctl stop rustdesksignal.service
@@ -68,7 +68,7 @@ cd /opt/rustdesk/
 rm hbbs
 rm hbbs
 RDLATEST=$(curl https://api.github.com/repos/rustdesk/rustdesk-server/releases/latest -s | grep "tag_name"| awk '{print substr($2, 2, length($2)-3) }')
-sudo wget "https://github.com/rustdesk/rustdesk-server/releases/download/${RDLATEST}/rustdesk-server-linux-x64.zip"
+wget "https://github.com/rustdesk/rustdesk-server/releases/download/${RDLATEST}/rustdesk-server-linux-x64.zip"
 unzip rustdesk-server-linux-x64.zip
 
 sudo systemctl start rustdesksignal.service
@@ -80,14 +80,14 @@ while ! [[ $CHECK_RUSTDESK_READY ]]; do
   sleep 3
 done
 
-sudo rm rustdesk-server-linux-x64.zip
+rm rustdesk-server-linux-x64.zip
 
 cd /opt/gohttp
 GOHTTPLATEST=$(curl https://api.github.com/repos/codeskyblue/gohttpserver/releases/latest -s | grep "tag_name"| awk '{print substr($2, 2, length($2)-3) }')
-sudo wget "https://github.com/codeskyblue/gohttpserver/releases/download/${GOHTTPLATEST}/gohttpserver_${GOHTTPLATEST}_linux_amd64.tar.gz"
+wget "https://github.com/codeskyblue/gohttpserver/releases/download/${GOHTTPLATEST}/gohttpserver_${GOHTTPLATEST}_linux_amd64.tar.gz"
 tar -xf  gohttpserver_${GOHTTPLATEST}_linux_amd64.tar.gz
 
-sudo rm gohttpserver_${GOHTTPLATEST}_linux_amd64.tar.gz
+rm gohttpserver_${GOHTTPLATEST}_linux_amd64.tar.gz
 
 sudo systemctl start gohttpserver.service