diff --git a/install/pialert_install.sh b/install/pialert_install.sh
index 72094072..9e401712 100644
--- a/install/pialert_install.sh
+++ b/install/pialert_install.sh
@@ -342,7 +342,7 @@ install_lighttpd() {
 # Install arp-scan & dnsutils
 # ------------------------------------------------------------------------------
 install_arpscan() {
-  print_header "arp-scan & dnsutils"
+  print_header "arp-scan, dnsutils and nmap"
 
   print_msg "- Installing arp-scan..."
   sudo apt-get install arp-scan -y                                2>&1 >> "$LOG"
@@ -352,6 +352,9 @@ install_arpscan() {
 
   print_msg "- Installing dnsutils & net-tools..."
   sudo apt-get install dnsutils net-tools -y                      2>&1 >> "$LOG"
+
+  print_msg "- Installing nmap and zip..."
+  sudo apt-get install nmap zip -y                                2>&1 >> "$LOG"
 }
   
 
@@ -454,7 +457,7 @@ download_pialert() {
   fi
   
   print_msg "- Downloading installation tar file..."
-  curl -Lo "$INSTALL_DIR/pialert_latest.tar" https://github.com/leiweibau/Pi.Alert/raw/setup_test/tar/pialert_latest.tar
+  curl -Lo "$INSTALL_DIR/pialert_latest.tar" https://github.com/leiweibau/Pi.Alert/raw/main/tar/pialert_latest.tar
   echo ""
 
   print_msg "- Uncompressing tar file"
@@ -525,6 +528,10 @@ test_pialert() {
   print_msg "*** PLEASE WAIT A COUPLE OF MINUTES..."
   stdbuf -i0 -o0 -e0  $PYTHON_BIN $PIALERT_HOME/back/pialert.py 1                                2>&1 | tee -ai "$LOG"
 
+  echo ""
+  print_msg "- Enable optional Speedtest..."
+  chmod +x $PIALERT_HOME/back/speedtest-cli
+
   if $FIRST_SCAN_KNOWN ; then
     echo ""
     print_msg "- Set devices as Known devices..."