diff --git a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/usbconfig.sh b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/usbconfig.sh
index cfc1560..3ff53b4 100755
--- a/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/usbconfig.sh
+++ b/foxbuntu/sysdrv/out/rootfs_uclibc_rv1106/usr/local/bin/usbconfig.sh
@@ -26,13 +26,13 @@ exit_script() {
 
 #Blink
 blink() {
-    echo 1 > /sys/class/gpio/gpio34/value; #LED on
-    sleep "$1"; #wait
-    echo 0 > /sys/class/gpio/gpio34/value; #LED off
+  echo 1 > /sys/class/gpio/gpio34/value; #LED on
+  sleep "$1"; #wait
+  echo 0 > /sys/class/gpio/gpio34/value; #LED off
 }
 
 escape_sed() {
-    echo "$1" | sed -e 's/[]\/$*.^[]/\\&/g'
+  echo "$1" | sed -e 's/[]\/$*.^[]/\\&/g'
 }
 
 # Check if the mount point exists and if a USB drive is plugged in
@@ -75,16 +75,16 @@ else
   fi
 fi
 
-  wpa_supplicant_conf="/etc/wpa_supplicant/wpa_supplicant.conf"
-  usb_config="/tmp/femtofox-config.txt"
+wpa_supplicant_conf="/etc/wpa_supplicant/wpa_supplicant.conf"
+usb_config="/tmp/femtofox-config.txt"
 
 # Check if the mounted USB drive contains a file femtofox-config.txt
 if [ -f "$mount_point/femtofox-config.txt" ]; then
   log_message "femtofox-config.txt found on USB drive."
-
+  
   # Remove Windows-style carriage returns and save a temporary copy of femtofox-config.txt
-	tr -d '\r' < "$mount_point/femtofox-config.txt" > $usb_config
-
+  tr -d '\r' < "$mount_point/femtofox-config.txt" > $usb_config
+  
   # Initialize variables
   wifi_ssid=""
   wifi_psk=""
@@ -92,55 +92,56 @@ if [ -f "$mount_point/femtofox-config.txt" ]; then
   meshtastic_lora_radio=""
   found_config="false"
   update_wifi="false"
-  update_meshtastic=""
-
+  update_meshtastic_url=""
+  update_meshtastic_security=""
+  
   # Escape and read the fields from the USB config file if they exist
   while IFS='=' read -r key value; do
-      value=$(echo "$value" | tr -d '"')
-      case "$key" in
-          wifi_ssid) wifi_ssid=$(escape_sed "$value") ;;
-          wifi_psk) wifi_psk=$(escape_sed "$value") ;;
-          wifi_country) wifi_country=$(escape_sed "$value") ;;
-          meshtastic_lora_radio) meshtastic_lora_radio=$(escape_sed "$value") ;;
-          timezone) timezone=$(escape_sed "$value") ;;
-          meshtastic_url) meshtastic_url=$(escape_sed "$value") ;;
-          meshtastic_legacy_admin) meshtastic_legacy_admin=$(escape_sed "$value") ;;
-          meshtastic_admin_key) meshtastic_admin_key=$(escape_sed "$value") ;;
-      esac
+    value=$(echo "$value" | tr -d '"')
+    case "$key" in
+      wifi_ssid) wifi_ssid=$(escape_sed "$value") ;;
+      wifi_psk) wifi_psk=$(escape_sed "$value") ;;
+      wifi_country) wifi_country=$(escape_sed "$value") ;;
+      meshtastic_lora_radio) meshtastic_lora_radio=$(escape_sed "$value") ;;
+      timezone) timezone=$(escape_sed "$value") ;;
+      meshtastic_url) meshtastic_url=$(escape_sed "$value") ;;
+      meshtastic_legacy_admin) meshtastic_legacy_admin=$(escape_sed "$value") ;;
+      meshtastic_admin_key) meshtastic_admin_key=$(escape_sed "$value") ;;
+    esac
   done < <(grep -E '^(wifi_ssid|wifi_psk|wifi_country|meshtastic_lora_radio|timezone|meshtastic_url|meshtastic_legacy_admin|meshtastic_admin_key)=' "$usb_config")
-
-
+  
+  
   # Update wpa_supplicant.conf with the new values, if specified
   if [[ -n "$wifi_country" ]]; then
-      # Update or add the country field
-      if grep -q "^country=" "$wpa_supplicant_conf"; then
-          sed -i "s/^country=.*/country=$wifi_country/" "$wpa_supplicant_conf"
-          log_message "Updated Wi-Fi country in wpa_supplicant.conf to $wifi_country."
-      else
-          echo "country=$wifi_country" >> "$wpa_supplicant_conf"
-          log_message "Added Wi-Fi country to wpa_supplicant.conf as $wifi_country."
-      fi
-      found_config="true"
-      update_wifi="true"
+    # Update or add the country field
+    if grep -q "^country=" "$wpa_supplicant_conf"; then
+      sed -i "s/^country=.*/country=$wifi_country/" "$wpa_supplicant_conf"
+      log_message "Updated Wi-Fi country in wpa_supplicant.conf to $wifi_country."
+    else
+      echo "country=$wifi_country" >> "$wpa_supplicant_conf"
+      log_message "Added Wi-Fi country to wpa_supplicant.conf as $wifi_country."
+    fi
+    found_config="true"
+    update_wifi="true"
   fi
-
+  
   if [[ -n "$wifi_ssid" ]]; then
-      # Update the ssid in the network block
-      sed -i "/ssid=/s/\".*\"/\"$wifi_ssid\"/" "$wpa_supplicant_conf"
-      log_message "Updated Wi-Fi SSID in wpa_supplicant.conf to $wifi_ssid."
-      found_config="true"
-      update_wifi="true"
+    # Update the ssid in the network block
+    sed -i "/ssid=/s/\".*\"/\"$wifi_ssid\"/" "$wpa_supplicant_conf"
+    log_message "Updated Wi-Fi SSID in wpa_supplicant.conf to $wifi_ssid."
+    found_config="true"
+    update_wifi="true"
   fi
-
+  
   if [[ -n "$wifi_psk" ]]; then
-      # Update the psk in the network block
-      sed -i "/psk=/s/\".*\"/\"$wifi_psk\"/" "$wpa_supplicant_conf"
-      log_message "Updated Wi-Fi PSK in wpa_supplicant.conf."
-      found_config="true"
-      update_wifi="true"
+    # Update the psk in the network block
+    sed -i "/psk=/s/\".*\"/\"$wifi_psk\"/" "$wpa_supplicant_conf"
+    log_message "Updated Wi-Fi PSK in wpa_supplicant.conf."
+    found_config="true"
+    update_wifi="true"
   fi
-
-
+  
+  
   #get meshtastic_lora_radio model, if specified, and copy appropriate yaml to /etc/meshtasticd/config.d/
   if [[ -n "$meshtastic_lora_radio" ]]; then
     rm -f /etc/meshtasticd/config.d/femtofox*
@@ -148,86 +149,88 @@ if [ -f "$mount_point/femtofox-config.txt" ]; then
     meshtastic_lora_radio=$(echo "$meshtastic_lora_radio" | tr '[:upper:]' '[:lower:]')
     case "$meshtastic_lora_radio" in
       'ebyte-e22-900m30s')
-      cp /etc/meshtasticd/available.d/femtofox_EByte-E22-900M30S_Ebyte-E22-900M22S.yaml /etc/meshtasticd/config.d
-        ;;
+        cp /etc/meshtasticd/available.d/femtofox_EByte-E22-900M30S_Ebyte-E22-900M22S.yaml /etc/meshtasticd/config.d
+      ;;
       'ebyte-e22-900m22s')
-      cp /etc/meshtasticd/available.d/femtofox_EByte-E22-900M30S_Ebyte-E22-900M22S.yaml /etc/meshtasticd/config.d
-        ;;
+        cp /etc/meshtasticd/available.d/femtofox_EByte-E22-900M30S_Ebyte-E22-900M22S.yaml /etc/meshtasticd/config.d
+      ;;
       'e22-900mm22s')
-      cp /etc/meshtasticd/available.d/femtofox_EByte-E22-900MM22S.yaml /etc/meshtasticd/config.d
-        ;;
+        cp /etc/meshtasticd/available.d/femtofox_EByte-E22-900MM22S.yaml /etc/meshtasticd/config.d
+      ;;
       'heltec-ht-ra62')
-      cp /etc/meshtasticd/available.d/femtofox_Heltec-HT-RA62_Seeed-WIO-SX1262.yaml /etc/meshtasticd/config.d
-        ;;
+        cp /etc/meshtasticd/available.d/femtofox_Heltec-HT-RA62_Seeed-WIO-SX1262.yaml /etc/meshtasticd/config.d
+      ;;
       'seeed-wio-sx1262')
-      cp /etc/meshtasticd/available.d/femtofox_Heltec-HT-RA62_Seeed-WIO-SX1262.yaml /etc/meshtasticd/config.d
-        ;;
+        cp /etc/meshtasticd/available.d/femtofox_Heltec-HT-RA62_Seeed-WIO-SX1262.yaml /etc/meshtasticd/config.d
+      ;;
       'waveshare-sx126x-xxxm')
-      cp /etc/meshtasticd/available.d/femtofox_Waveshare-SX126X-XXXM_AI-Thinker-RA-01SH.yaml /etc/meshtasticd/config.d
-        ;;
+        cp /etc/meshtasticd/available.d/femtofox_Waveshare-SX126X-XXXM_AI-Thinker-RA-01SH.yaml /etc/meshtasticd/config.d
+      ;;
       'ai-thinker-ra-01sh')
-      cp /etc/meshtasticd/available.d/femtofox_Waveshare-SX126X-XXXM_AI-Thinker-RA-01SH.yaml /etc/meshtasticd/config.d
-        ;;
+        cp /etc/meshtasticd/available.d/femtofox_Waveshare-SX126X-XXXM_AI-Thinker-RA-01SH.yaml /etc/meshtasticd/config.d
+      ;;
       'none')
-        ;;
+      ;;
       *)
         log_message "Invalid LoRa radio name: $meshtastic_lora_radio, ignoring."
         found_config="false"
-        ;;
+      ;;
     esac
     if [ "$found_config" = "true" ]; then
       systemctl restart meshtasticd
       log_message "Set LoRa radio to $meshtastic_lora_radio, restarting Meshtasticd."
     fi
   fi
-
+  
   if [[ -n "$timezone" ]]; then
-      #sed -i "/timezone=/s/\".*\"/\"$timezone\"/" "$wpa_supplicant_conf"
-      timezone=$(echo "$timezone" | sed 's/\\//g')
-      log_message "Updating system timezone to $timezone."
-      rm /etc/localtime
-      ln -sf /usr/share/zoneinfo/$timezone /etc/localtime >> /tmp/femtofox-config.log 2>&1
-      found_config="true"
+    #sed -i "/timezone=/s/\".*\"/\"$timezone\"/" "$wpa_supplicant_conf"
+    timezone=$(echo "$timezone" | sed 's/\\//g')
+    log_message "Updating system timezone to $timezone."
+    rm /etc/localtime
+    ln -sf /usr/share/zoneinfo/$timezone /etc/localtime >> /tmp/femtofox-config.log 2>&1
+    found_config="true"
   fi
-
+  
   if [[ -n "$meshtastic_url" ]]; then
-      meshtastic_url=$(echo "$meshtastic_url" | sed 's/\\//g')
-      log_message "Updating Meshtastic URL."
-      found_config="true"
-      update_meshtastic="--seturl $meshtastic_url"
+    meshtastic_url=$(echo "$meshtastic_url" | sed 's/\\//g')
+    log_message "Updating Meshtastic URL."
+    found_config="true"
+    update_meshtastic_url="--seturl $meshtastic_url"
   fi
-
+  
   if [[ -n "$meshtastic_admin_key" ]]; then
-      if [ "$update_meshtastic" = "" ]; then
-        meshtastic_admin_key=$(echo "$meshtastic_admin_key" | sed 's/\\//g')
-        log_message "Updating Meshtastic admin key."
-        found_config="true"
-        update_meshtastic=" --set security.admin_key $meshtastic_admin_key"
-      else
-        log_message "meshtastic_admin_key: Cannot update Meshtastic URL and security settings in single operation. Remove Meshtastic URL from femtofox-config.txt to make changes to security settings. Ignoring..."
-      fi
+    meshtastic_admin_key=$(echo "$meshtastic_admin_key" | sed 's/\\//g')
+    log_message "Updating Meshtastic admin key."
+    found_config="true"
+    update_meshtastic_security+=" --set security.admin_key base64:$meshtastic_admin_key"
   fi
   
   if [[ -n "$meshtastic_legacy_admin" ]]; then
-      if [ "$update_meshtastic" = "" ] || [[ "$update_meshtastic" == *security* ]]; then
-        meshtastic_legacy_admin=$(echo "$meshtastic_legacy_admin" | sed 's/\\//g')
-        log_message "Updating Meshtastic legacy admin."
-        found_config="true"
-        update_meshtastic+=" --set security.admin_channel_enabled $meshtastic_legacy_admin"
-      else
-        log_message "meshtastic_legacy_admin: Cannot update Meshtastic URL and security settings in single operation. Remove Meshtastic URL from femtofox-config.txt to make changes to security settings. Ignoring..."
-      fi
+    meshtastic_legacy_admin=$(echo "$meshtastic_legacy_admin" | sed 's/\\//g')
+    log_message "Updating Meshtastic legacy admin."
+    found_config="true"
+    update_meshtastic_security+=" --set security.admin_channel_enabled $meshtastic_legacy_admin"
   fi
-
+  
   if [ "$found_config" = true ]; then #if we found a config file containing valid data
-
+    
     if [ "$update_wifi" = true ]; then #if wifi config found, restart wifi
       sudo systemctl restart wpa_supplicant 2>&1 | sudo tee -a /tmp/femtofox-config.log
       sudo wpa_cli -i wlan0 reconfigure 2>&1 | sudo tee -a /tmp/femtofox-config.log
       log_message "wpa_supplicant.conf updated and wifi restarted. Enabling Meshtastic wifi setting."
       sudo dhclient 2>&1 | sudo tee -a /tmp/femtofox-config.log
-
-      /usr/local/bin/updatemeshtastic.sh "--set network.wifi_enabled true" 7 "USB config" #| sudo tee -a /tmp/femtofox-config.log
+      
+      /usr/local/bin/updatemeshtastic.sh "--set network.wifi_enabled true" 10 "USB config" #| sudo tee -a /tmp/femtofox-config.log
+      if [ $? -eq 1 ]; then
+        log_message "Update of Meshtastic FAILED."
+      else
+        log_message "Updated Meshtastic successfully."
+      fi
+    fi
+    
+    if [ "$update_meshtastic_url" != "" ]; then
+      log_message "Connecting to Meshtastic radio and submitting $update_meshtastic_url"
+      /usr/local/bin/updatemeshtastic.sh "$update_meshtastic_url" 10 "USB config" #| sudo tee -a /tmp/femtofox-config.log
       if [ $? -eq 1 ]; then
         log_message "Update of Meshtastic FAILED."
       else
@@ -235,20 +238,19 @@ if [ -f "$mount_point/femtofox-config.txt" ]; then
       fi
     fi
 
-    if [ "$update_meshtastic" != "" ]; then
-      log_message "Connecting to Meshtastic radio and submitting $update_meshtastic"
-      /usr/local/bin/updatemeshtastic.sh "$update_meshtastic" 7 "USB config" #| sudo tee -a /tmp/femtofox-config.log
+    if [ "$update_meshtastic_security" != "" ]; then
+      log_message "Connecting to Meshtastic radio and submitting $update_meshtastic_security"
+      /usr/local/bin/updatemeshtastic.sh "$update_meshtastic_security" 10 "USB config" #| sudo tee -a /tmp/femtofox-config.log
       if [ $? -eq 1 ]; then
         log_message "Update of Meshtastic FAILED."
       else
         log_message "Updated Meshtastic successfully."
       fi
     fi
-
+    
     for _ in {1..10}; do #do our successful config boot code
       blink "0.125" && sleep 0.125
     done
-
   else #if no valid data in config file
     log_message "femtofox-config.txt does not contain valid configuration info, ignoring."
     for _ in {1..5}; do #boot code
@@ -256,7 +258,7 @@ if [ -f "$mount_point/femtofox-config.txt" ]; then
     done
     exit_script 1
   fi
-
+  
 else
   log_message "USB drive mounted but femtofox-config.txt not found, ignoring."
   for _ in {1..3}; do #boot code
@@ -265,5 +267,5 @@ else
   exit_script 1
 fi
 
-  rm $usb_config #remove temporary copy of femtofox-config.txt
-  exit_script 0
+rm $usb_config #remove temporary copy of femtofox-config.txt
+exit_script 0