diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp
index 6e688bdd2..752dcc955 100644
--- a/src/emsdevice.cpp
+++ b/src/emsdevice.cpp
@@ -1438,13 +1438,13 @@ void EMSdevice::dump_devicevalue_info() {
             Serial.print(",");
 
             // modbus specific infos
-            Serial.print(device_type());
+            Serial.print(device_type()); // modbus unit identifier
             Serial.print(',');
 
-            Serial.print(dv.tag);
+            Serial.print(dv.tag); // modbus block
             Serial.print(',');
 
-            // numeric operator -> scale factor
+            // numeric operator -> modbus scale factor
             if (dv.numeric_operator == 0)
                 Serial.print("1");
             else if (dv.numeric_operator > 0)
@@ -1453,10 +1453,10 @@ void EMSdevice::dump_devicevalue_info() {
                 Serial.print(-dv.numeric_operator);
             Serial.print(",");
 
-            Serial.printf("%d", EMSESP::modbus_->getRegisterOffset(dv));
+            Serial.printf("%d", EMSESP::modbus_->getRegisterOffset(dv)); // modbus offset
             Serial.print(",");
 
-            Serial.printf("%d", EMSESP::modbus_->getRegisterCount(dv));
+            Serial.printf("%d", EMSESP::modbus_->getRegisterCount(dv)); // modbus count
 
             // /modbus specific infos
 
diff --git a/src/emsdevicevalue.h b/src/emsdevicevalue.h
index d193aa924..ec4bf4e76 100644
--- a/src/emsdevicevalue.h
+++ b/src/emsdevicevalue.h
@@ -78,7 +78,7 @@ class DeviceValue {
         CONNECTIVITY // 27 - used in HA
     };
 
-    // TAG mapping - maps to DeviceValueTAG_s in emsdevice.cpp
+    // TAG mapping - maps to DeviceValueTAG_s in emsdevicevalue.cpp
     enum DeviceValueTAG : int8_t {
         TAG_NONE        = -1, // wild card
         TAG_DEVICE_DATA = 0,
diff --git a/src/locale_common.h b/src/locale_common.h
index 61e7de0b1..75ad68e1e 100644
--- a/src/locale_common.h
+++ b/src/locale_common.h
@@ -231,7 +231,7 @@ MAKE_NOTRANSLATION(tpl_input4, "<inv>[<comp><aux><cool><heat><dhw><pv>]")
 MAKE_NOTRANSLATION(test_cmd, "run a test")
 #endif
 
-// TAG mapping - maps to DeviceValueTAG_s in emsdevice.cpp
+// TAG mapping - maps to DeviceValueTAG_s in emsdevicevalue.cpp
 // use empty string if want to suppress showing tags
 // mqtt tags must not have spaces
 MAKE_NOTRANSLATION(tag_none, "")