diff --git a/src/boiler.ino b/src/boiler.ino
index 20e354a7f..7268584ba 100644
--- a/src/boiler.ino
+++ b/src/boiler.ino
@@ -373,6 +373,8 @@ void showInfo() {
     if (ems_getThermostatEnabled()) {
         myDebug("%sThermostat stats:%s", COLOR_BOLD_ON, COLOR_BOLD_OFF);
         myDebug("  Thermostat type: %s", ems_getThermostatType(buffer_type));
+        _renderFloatValue("Setpoint room temperature", "C", EMS_Thermostat.setpoint_roomTemp);
+        _renderFloatValue("Current room temperature", "C", EMS_Thermostat.curr_roomTemp);
         if (ems_getThermostatModel() != EMS_MODEL_EASY) {
             myDebug("  Thermostat time is %02d:%02d:%02d %d/%d/%d",
                     EMS_Thermostat.hour,
@@ -381,19 +383,16 @@ void showInfo() {
                     EMS_Thermostat.day,
                     EMS_Thermostat.month,
                     EMS_Thermostat.year + 2000);
-        }
 
-        _renderFloatValue("Setpoint room temperature", "C", EMS_Thermostat.setpoint_roomTemp);
-        _renderFloatValue("Current room temperature", "C", EMS_Thermostat.curr_roomTemp);
-
-        if (EMS_Thermostat.mode == 0) {
-            myDebug("  Mode is set to low");
-        } else if (EMS_Thermostat.mode == 1) {
-            myDebug("  Mode is set to manual");
-        } else if (EMS_Thermostat.mode == 2) {
-            myDebug("  Mode is set to auto");
-        } else {
-            myDebug("  Mode is set to ?");
+            if (EMS_Thermostat.mode == 0) {
+                myDebug("  Mode is set to low");
+            } else if (EMS_Thermostat.mode == 1) {
+                myDebug("  Mode is set to manual");
+            } else if (EMS_Thermostat.mode == 2) {
+                myDebug("  Mode is set to auto");
+            } else {
+                myDebug("  Mode is set to ?");
+            }
         }
     }
 
@@ -754,7 +753,7 @@ void do_systemCheck() {
 
 // force calls to get data from EMS for the types that aren't sent as broadcasts
 void do_regularUpdates() {
-    myDebugLog("Calling schedule fetch of values from EMS devices..");
+    myDebugLog("Calling scheduled data refresh from EMS devices..");
     ems_getThermostatValues(); // get Thermostat temps (if supported)
     ems_getBoilerValues();
 }
diff --git a/src/ems.cpp b/src/ems.cpp
index bfa7a298a..e0c1e1d73 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -39,8 +39,6 @@ void _process_RC30StatusMessage(uint8_t * data, uint8_t length);
 void _process_RC35Set(uint8_t * data, uint8_t length);
 void _process_RC35StatusMessage(uint8_t * data, uint8_t length);
 
-// RC35
-
 // Easy
 void _process_EasyStatusMessage(uint8_t * data, uint8_t length);
 
@@ -1086,7 +1084,7 @@ void _process_Version(uint8_t * data, uint8_t length) {
     // set a thermostat
     if (isThermostat) {
         if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_BASIC) {
-            myDebug("Found a Thermostat. Model %s with TypeID 0x%02X, Product ID %d, Version %s",
+            myDebug("Thermostat recognized. Model %s with TypeID 0x%02X, Product ID %d, Version %s",
                     Model_Types[i].model_string,
                     Model_Types[i].type_id,
                     product_id,
@@ -1107,7 +1105,7 @@ void _process_Version(uint8_t * data, uint8_t length) {
     } else {
         // otherwise assume its a boiler
         if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_BASIC) {
-            myDebug("Found a Boiler compatible device, model %s with TypeID 0x%02X, Product ID %d, Version %s",
+            myDebug("Boiler recognized. Model %s with TypeID 0x%02X, Product ID %d, Version %s",
                     Model_Types[i].model_string,
                     Model_Types[i].type_id,
                     product_id,