diff --git a/espotabatch.py b/espotabatch.py
index 1942a41..e51adb8 100755
--- a/espotabatch.py
+++ b/espotabatch.py
@@ -6,15 +6,14 @@ import time
 # and each client contains mDNS name and the path to .bin file
 esps = [
   #mDNS name of ESP   #path to ".bin" file
-    ['192.168.128.112', 'macchina-a0'],
-    ['192.168.128.124', 'm5stickc'],
-    ['192.168.128.64', 'm5atom-matrix'],
-    ['192.168.128.84', 'm5atom-matrix']
+    ['192.168.128.113', 'macchina-a0'],
+    ['192.168.128.64', 'm5atom'],
+    ['192.168.128.84', 'm5atom']
 ]
 esp_respond_sender_port = '3232'
 sender_to_esp_port = '3232'
 
-cmd = 'pio run -e m5atom-matrix -e macchina-a0 -e m5stickc'
+cmd = 'pio run -e m5atom -e macchina-a0'
 p = subprocess.call(cmd, shell=True)
 
 for esp in esps:
diff --git a/src/main.cpp b/src/main.cpp
index 4ce83d1..7ba9644 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -165,6 +165,9 @@ void setupNetwork()
 #endif
     room = AsyncWiFiSettings.string("room", ESPMAC, "Room");
     std::vector<String> ethernetTypes = {"None", "WT32-ETH01", "ESP32-POE", "WESP32", "QuinLED-ESP32", "TwilightLord-ESP32", "ESP32Deux", "KIT-VE", "LilyGO-T-ETH-POE"};
+    auto allChannelScan = AsyncWiFiSettings.checkbox("all_channel_scan", false, "WiFi: Scan for all APs on all channels");
+    if (allChannelScan) WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN);
+    else WiFi.setScanMethod(WIFI_FAST_SCAN);
     ethernetType = AsyncWiFiSettings.dropdown("eth", ethernetTypes, 0, "Ethernet Type");
 
     AsyncWiFiSettings.heading("MQTT <a href='https://espresense.com/configuration/settings#mqtt' target='_blank'>ℹ️</a>", false);
@@ -239,6 +242,7 @@ void setupNetwork()
 #ifdef VERSION
     Serial.println("Version:      " + String(VERSION));
 #endif
+    Serial.printf("WiFi Scan:    %s (picked channel=%d bss=%s rssi=%d)\n", (allChannelScan ? "All" : "Fast"), WiFi.channel(), WiFi.BSSIDstr().c_str(), WiFi.RSSI());
     Serial.print("IP address:   ");
     Serial.println(Network.localIP());
     Serial.print("DNS address:  ");
@@ -250,6 +254,7 @@ void setupNetwork()
     Serial.printf("MQTT server:  %s:%d\n", mqttHost.c_str(), mqttPort);
     Serial.printf("Max Distance: %.2f\n", BleFingerprintCollection::maxDistance);
     Motion::SerialReport();
+    I2C::SerialReport();
 #ifdef SENSORS
     DHT::SerialReport();
     BH1750::SerialReport();
@@ -267,6 +272,7 @@ void setupNetwork()
     Serial.println(BleFingerprintCollection::knownMacs);
     Serial.print("Count Ids:    ");
     Serial.println(BleFingerprintCollection::countIds);
+    Serial.println();
 
     localIp = Network.localIP().toString();
     id = slugify(room);