diff --git a/esp32_marauder/Buffer.h b/esp32_marauder/Buffer.h
index c4f7f8f..b339a6b 100644
--- a/esp32_marauder/Buffer.h
+++ b/esp32_marauder/Buffer.h
@@ -18,9 +18,6 @@ class Buffer {
     void addPacket(uint8_t* buf, uint32_t len);
     void save(fs::FS* fs);
     void forceSave(fs::FS* fs);
-
-    uint32_t bufSizeA = 0;
-    uint32_t bufSizeB = 0;
   private:
     void write(int32_t n);
     void write(uint32_t n);
@@ -30,6 +27,9 @@ class Buffer {
     uint8_t* bufA;
     uint8_t* bufB;
 
+    uint32_t bufSizeA = 0;
+    uint32_t bufSizeB = 0;
+
     bool writing = false; // acceppting writes to buffer
     bool useA = true; // writing to bufA or bufB
     bool saving = false; // currently saving onto the SD card
diff --git a/esp32_marauder/MenuFunctions.cpp b/esp32_marauder/MenuFunctions.cpp
index 4f1dd64..ab0b4ef 100644
--- a/esp32_marauder/MenuFunctions.cpp
+++ b/esp32_marauder/MenuFunctions.cpp
@@ -263,7 +263,6 @@ void MenuFunctions::battery2(bool initial)
 void MenuFunctions::updateStatusBar()
 {
   uint16_t the_color; 
-  display_obj.tft.setTextSize(1);
 
   // Draw temp info
   if (temp_obj.current_temp < 70)
@@ -321,7 +320,6 @@ void MenuFunctions::updateStatusBar()
 
 void MenuFunctions::drawStatusBar()
 {
-  display_obj.tft.setTextSize(1);
   display_obj.tft.fillRect(0, 0, 240, STATUS_BAR_WIDTH, STATUSBAR_COLOR);
   //display_obj.tft.fillRect(0, STATUS_BAR_WIDTH + 1, 240, 1, TFT_DARKGREY);
   display_obj.tft.setTextColor(TFT_WHITE, STATUSBAR_COLOR);
diff --git a/esp32_marauder/SDInterface.cpp b/esp32_marauder/SDInterface.cpp
index c43cd54..e6c26d7 100644
--- a/esp32_marauder/SDInterface.cpp
+++ b/esp32_marauder/SDInterface.cpp
@@ -19,10 +19,8 @@ bool SDInterface::stopSD() {
   Serial.println("Stopping SD card");
   //delete &buffer_obj;
   //buffer_obj = NULL;
-  //this->sd_running = false;
-  //sdcard_uninit();
-  //SD.end();
-  Serial.println(ESP.getFreeHeap());
+  this->sd_running = false;
+  SD.end();
 }
 
 bool SDInterface::initSD() {
@@ -77,7 +75,7 @@ bool SDInterface::initSD() {
       this->card_sz = sz;
     }
 
-    buffer_obj = Buffer();
+    //buffer_obj = Buffer();
 
     //if (this->supported)
     //  buffer_obj.open(&SD);
diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
index 17696ac..8f23ad6 100644
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
@@ -131,9 +131,6 @@ WiFiScan::WiFiScan()
 // Function to prepare to run a specific scan
 void WiFiScan::StartScan(uint8_t scan_mode, uint16_t color)
 {  
-  Serial.println("bufSizeA: " + (String)buffer_obj.bufSizeA);
-  Serial.println("bufSizeB: " + (String)buffer_obj.bufSizeB);
-  
   //Serial.println("Starting Scan...");
   if (scan_mode == WIFI_SCAN_OFF)
     StopScan(scan_mode);
@@ -168,23 +165,13 @@ void WiFiScan::StartScan(uint8_t scan_mode, uint16_t color)
 void WiFiScan::shutdownWiFi() {
   Serial.println("Ahhh yes...promiscuity will end");
   esp_wifi_set_promiscuous(false);
-  //Serial.println("WiFi.persistent(false)");
-  //WiFi.persistent(false); // I think this broke something when leaving packet monitor
-  Serial.println("WiFi.disconnect(true);");
+  WiFi.persistent(false);
   WiFi.disconnect(true);
-  Serial.println("WIFI_OFF");
   WiFi.mode(WIFI_OFF);
 
-  Serial.println("esp_wifi_set_mode(WIFI_MODE_NULL);");
   esp_wifi_set_mode(WIFI_MODE_NULL);
-  Serial.println("esp_wifi_stop();");
   esp_wifi_stop();
-  Serial.println("esp_wifi_deinit();");
   esp_wifi_deinit();
-  Serial.println("Finished stopping WiFi");
-
-  Serial.println("bufSizeA: " + (String)buffer_obj.bufSizeA);
-  Serial.println("bufSizeB: " + (String)buffer_obj.bufSizeB);
 }
 
 // Function to stop all wifi scans
@@ -365,7 +352,7 @@ void WiFiScan::RunInfo()
 }
 
 void WiFiScan::RunEspressifScan(uint8_t scan_mode, uint16_t color) {
-  //sd_obj.startSD();
+  sd_obj.startSD();
   sd_obj.openCapture("espressif");
   
   display_obj.TOP_FIXED_AREA_2 = 48;
@@ -398,7 +385,7 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color)
   display_obj.tft.init();
   display_obj.tft.setRotation(1);
   display_obj.tft.fillScreen(TFT_BLACK);
-  //sd_obj.startSD();
+  sd_obj.startSD();
   sd_obj.openCapture("packet_monitor");
   
   #ifdef TFT_SHIELD
@@ -444,7 +431,7 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color)
   display_obj.tft.init();
   display_obj.tft.setRotation(1);
   display_obj.tft.fillScreen(TFT_BLACK);
-  //sd_obj.startSD();
+  sd_obj.startSD();
   sd_obj.openCapture("eapol");
 
   #ifdef TFT_SHIELD
@@ -472,7 +459,7 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color)
   display_obj.tftDrawExitScaleButtons();
 
 
-  wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
+  //wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
   esp_wifi_init(&cfg);
   esp_wifi_set_storage(WIFI_STORAGE_RAM);
   esp_wifi_set_mode(WIFI_MODE_NULL);
@@ -549,7 +536,7 @@ void WiFiScan::RunBeaconSpam(uint8_t scan_mode, uint16_t color)
 
 void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color)
 {
-  //sd_obj.startSD();
+  sd_obj.startSD();
   sd_obj.openCapture("pwnagotchi");
   
   display_obj.TOP_FIXED_AREA_2 = 48;
@@ -580,7 +567,7 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color)
 // Function to start running a beacon scan
 void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color)
 {
-  //sd_obj.startSD();
+  sd_obj.startSD();
   sd_obj.openCapture("beacon");
   
   display_obj.TOP_FIXED_AREA_2 = 48;
@@ -610,7 +597,7 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color)
 
 void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color)
 {
-  //sd_obj.startSD();
+  sd_obj.startSD();
   sd_obj.openCapture("deauth");
   
   display_obj.TOP_FIXED_AREA_2 = 48;
@@ -642,7 +629,7 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color)
 // Function for running probe request scan
 void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color)
 {
-  //sd_obj.startSD();
+  sd_obj.startSD();
   sd_obj.openCapture("probe");
   
   display_obj.TOP_FIXED_AREA_2 = 48;