diff --git a/Documentation/MQTT/MQTT topics.docx b/Documentation/MQTT/MQTT topics.docx
index 30d0ba3..eb4959f 100644
Binary files a/Documentation/MQTT/MQTT topics.docx and b/Documentation/MQTT/MQTT topics.docx differ
diff --git a/src/Bluetooth/BluetoothESP32.cpp b/src/Bluetooth/BluetoothESP32.cpp
index 9f92557..e356881 100644
--- a/src/Bluetooth/BluetoothESP32.cpp
+++ b/src/Bluetooth/BluetoothESP32.cpp
@@ -51,6 +51,7 @@ CBluetoothESP32HC05::_openSerial(int baudrate)
   // Open Serial port on the ESP32
   // best to explicitly specify pins for the pin multiplexer!   
   HC05_SerialPort.begin(baudrate, SERIAL_8N1, _rxPin, _txPin);
+  pinMode(_rxPin, INPUT_PULLUP);  // newer modules seem to be open drian - sort of - need a pullup to work properly anyway
 }
 //                              ^
 //                              |
diff --git a/src/Bluetooth/BluetoothHC05.cpp b/src/Bluetooth/BluetoothHC05.cpp
index 21e49cb..ec6de19 100644
--- a/src/Bluetooth/BluetoothHC05.cpp
+++ b/src/Bluetooth/BluetoothHC05.cpp
@@ -372,7 +372,8 @@ CBluetoothHC05::_decodeMACresponse(char* pResponse, int len)
 	}
 	if (deficit < 0) {  // more than 12 digits! - WHOA!
 		strcpy(_MAC, "unknown");
-    _bGotMAC = false;
+    // _bGotMAC = false;
+    _bGotMAC = true;
 	}
 	else {
     // build final colon separated MAC address
diff --git a/src/Utility/NVStorage.cpp b/src/Utility/NVStorage.cpp
index d96110f..460c56e 100644
--- a/src/Utility/NVStorage.cpp
+++ b/src/Utility/NVStorage.cpp
@@ -281,7 +281,7 @@ sHeaterTuning::load()
     validatedLoad("lowVolts", lowVolts, 115, u8inBoundsOrZero, 100, 125);
   else
     validatedLoad("lowVolts", lowVolts, 230, u8inBoundsOrZero, 200, 250);
-  validatedLoad("pumpCal", pumpCal, 0.02, 0.001, 1);
+  validatedLoad("pumpCal", pumpCal, 0.022, 0.001, 1);
   validatedLoad("maxFuelUsage", maxFuelUsage, 0, u16inBounds, 0, 10000);
   validatedLoad("warnFuelUsage", warnFuelUsage, 5, u16inBounds, 0, 100);
   validatedLoad("tempOffset0", DS18B20probe[0].offset, 0.0, -10.0, +10.0);
diff --git a/src/Utility/NVStorage.h b/src/Utility/NVStorage.h
index 891bc7f..d061924 100644
--- a/src/Utility/NVStorage.h
+++ b/src/Utility/NVStorage.h
@@ -87,7 +87,7 @@ struct sHeaterTuning : public CESP32_NVStorage {
     sysVoltage = 120;
     fanSensor = 1;
     glowDrive = 5;
-    pumpCal = 0.02;
+    pumpCal = 0.022;
     maxFuelUsage = 0;
     warnFuelUsage = 0;
     lowVolts = 115;
diff --git a/src/WiFi/ABMQTT.cpp b/src/WiFi/ABMQTT.cpp
index 0e6667c..a9824d4 100644
--- a/src/WiFi/ABMQTT.cpp
+++ b/src/WiFi/ABMQTT.cpp
@@ -134,7 +134,7 @@ void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties
   }
   else if(strcmp(topic, statusTopic) == 0) {  // check if incoming topic is our general status
     if(strcmp(szPayload, "1") == 0) {
-       // BasicMQTTmoderator.reset();
+      BasicMQTTmoderator.reset();
       MQTTclient.publish(statusTopic, NVstore.getMQTTinfo().qos, true, "online");
     }
   }