diff --git a/pwnagotchi/_version.py b/pwnagotchi/_version.py
index 2f7fd932..5fb05872 100644
--- a/pwnagotchi/_version.py
+++ b/pwnagotchi/_version.py
@@ -1 +1 @@
-__version__ = '2.9.5.3'
+__version__ = '2.9.5.4'
diff --git a/pwnagotchi/defaults.toml b/pwnagotchi/defaults.toml
index 5edaf9da..532e9d6a 100644
--- a/pwnagotchi/defaults.toml
+++ b/pwnagotchi/defaults.toml
@@ -84,27 +84,12 @@ main.plugins.webcfg.enabled = true
 
 main.plugins.webgpsmap.enabled = false
 
-main.plugins.wardriver.enabled = false
-main.plugins.wardriver.path = "/root/wardriver"
-main.plugins.wardriver.ui.enabled = true
-main.plugins.wardriver.ui.icon = false
-main.plugins.wardriver.ui.icon_reverse = false
-main.plugins.wardriver.ui.position.x = 7
-main.plugins.wardriver.ui.position.y = 85
-main.plugins.wardriver.wigle.enabled = true
-main.plugins.wardriver.wigle.api_key = ""
-main.plugins.wardriver.wigle.donate = false
-main.plugins.wardriver.whitelist = [
-    "network-1",
-    "network-2"
-]
-
-ain.plugins.wigle.enabled = false
+main.plugins.wigle.enabled = false
 main.plugins.wigle.api_key = "" # mandatory
 main.plugins.wigle.cvs_dir = "/tmp" # optionnal, is set, the CVS is written to this directory
 main.plugins.wigle.donate = false # default: off
 main.plugins.wigle.timeout = 30 # default: 30 
-main.plugins.wigle.position = (7, 85) # optionnal 
+main.plugins.wigle.position = [7, 85] # optionnal
 
 main.plugins.wpa-sec.enabled = false
 main.plugins.wpa-sec.api_key = ""
diff --git a/pwnagotchi/plugins/default/bt-tether.py b/pwnagotchi/plugins/default/bt-tether.py
index 1f253f13..7d797c1f 100644
--- a/pwnagotchi/plugins/default/bt-tether.py
+++ b/pwnagotchi/plugins/default/bt-tether.py
@@ -161,7 +161,7 @@ class BTTether(plugins.Plugin):
             logging.error("[BT-Tether] Phone name not provided")
             return
         if not ("mac" in self.options and re.match(MAC_PTTRN, self.options["mac"])):
-            logging.error("[BT-Tether] Error with mac adresse")
+            logging.error("[BT-Tether] Error with mac address")
             return            
 
         if not ("phone" in self.options and self.options["phone"].lower() in ["android", "ios"]):
@@ -274,7 +274,7 @@ class BTTether(plugins.Plugin):
                 bluetooth = "Error while checking bluetoothctl"
             
             try: 
-                device =self.nmcli(["-w", "0","device", "show", self.mac])
+                device = self.nmcli(["-w", "0","device", "show", self.mac])
                 device = device.stdout.replace('\n', '<br>')
             except Exception as e:
                 device = "Error while checking nmcli device"
diff --git a/pwnagotchi/plugins/default/wigle.py b/pwnagotchi/plugins/default/wigle.py
index ec120a67..2b5a367c 100644
--- a/pwnagotchi/plugins/default/wigle.py
+++ b/pwnagotchi/plugins/default/wigle.py
@@ -194,14 +194,16 @@ class Wigle(plugins.Plugin):
             content, delimiter=",", quoting=csv.QUOTE_NONE, escapechar="\\"
         )
         for gps_data, pcap_data in data:  # write WIFIs
+            try:
+                timestamp = datetime.strptime(gps_data["Updated"].rsplit(".")[0], "%Y-%m-%dT%H:%M:%S").strftime("%Y-%m-%d %H:%M:%S")
+            except ValueError:
+                timestamp = datetime.strptime(gps_data["Updated"].rsplit(".")[0], "%Y-%m-%d %H:%M:%S").strftime("%Y-%m-%d %H:%M:%S")
             writer.writerow(
                 [
                     pcap_data[WifiInfo.BSSID],
                     pcap_data[WifiInfo.ESSID],
                     f"[{']['.join(pcap_data[WifiInfo.ENCRYPTION])}]",
-                    datetime.strptime(
-                        gps_data["Updated"].rsplit(".")[0], "%Y-%m-%dT%H:%M:%S"
-                    ).strftime("%Y-%m-%d %H:%M:%S"),
+                    timestamp,
                     pcap_data[WifiInfo.CHANNEL],
                     pcap_data[WifiInfo.FREQUENCY],
                     pcap_data[WifiInfo.RSSI],