diff --git a/src/device_library.h b/src/device_library.h
index 7577b0a2e..ce7406e1f 100644
--- a/src/device_library.h
+++ b/src/device_library.h
@@ -51,7 +51,7 @@
 {210, DeviceType::BOILER, "Cascade MC400", DeviceFlags::EMS_DEVICE_FLAG_NONE},
 {211, DeviceType::BOILER, "EasyControl Adapter", DeviceFlags::EMS_DEVICE_FLAG_NONE},
 {219, DeviceType::BOILER, "Greenstar HIU/Logamax kompakt WS170", DeviceFlags::EMS_DEVICE_FLAG_HIU},
-{234, DeviceType::BOILER, "Logamax Plus GB122/Condense 2300", DeviceFlags::EMS_DEVICE_FLAG_NONE},
+{234, DeviceType::BOILER, "Logamax Plus GB122/Condense 2300/Junkers Cerapur GC2200W 20/25C", DeviceFlags::EMS_DEVICE_FLAG_NONE},
 
 // Controllers - 0x09 / 0x10 / 0x50
 { 68, DeviceType::CONTROLLER, "BC10/RFM20", DeviceFlags::EMS_DEVICE_FLAG_NONE}, // 0x09
@@ -100,7 +100,7 @@
 {215, DeviceType::THERMOSTAT, "Comfort RF", DeviceFlags::EMS_DEVICE_FLAG_CRF | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE}, // 0x18
 {216, DeviceType::THERMOSTAT, "CRF200S", DeviceFlags::EMS_DEVICE_FLAG_CRF | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE}, // 0x18
 {246, DeviceType::THERMOSTAT, "Comfort+2RF", DeviceFlags::EMS_DEVICE_FLAG_CRF | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE}, // 0x18
-{253, DeviceType::THERMOSTAT, "Rego 3000/UI800/WSW16i/BC400", DeviceFlags::EMS_DEVICE_FLAG_BC400}, // 0x10
+{253, DeviceType::THERMOSTAT, "Rego 3000/UI800/WSW1x6i/BC400", DeviceFlags::EMS_DEVICE_FLAG_BC400}, // 0x10
 
 // Thermostat - Sieger - 0x10 / 0x17
 { 66, DeviceType::THERMOSTAT, "ES72/RC20", DeviceFlags::EMS_DEVICE_FLAG_RC20_N}, // 0x17 or remote
diff --git a/src/mqtt.cpp b/src/mqtt.cpp
index 4a4afdc2d..3bbdf2118 100644
--- a/src/mqtt.cpp
+++ b/src/mqtt.cpp
@@ -95,7 +95,7 @@ void Mqtt::subscribe(const uint8_t device_type, const std::string & topic, mqtt_
 
     // register in our libary with the callback function.
     // We store the original topic string without base
-    // TODO check if ok to remove the std::move(topic)
+    // removed std::move(topic) in 3.7.0-dev.43
     mqtt_subfunctions_.emplace_back(device_type, topic, cb);
 
     if (!enabled() || !connected()) {
diff --git a/src/mqtt.h b/src/mqtt.h
index 012faabcd..4f88c59bd 100644
--- a/src/mqtt.h
+++ b/src/mqtt.h
@@ -256,7 +256,7 @@ class Mqtt {
         const std::string   topic_;            // short topic name
         mqtt_sub_function_p mqtt_subfunction_; // can be empty
 
-        // TODO see if remove &&topic to &topic is ok, so we don't need the std:move
+        // replaced &&topic with &topic in 3.7.0-dev.43, so we prevent the std:move later
         MQTTSubFunction(uint8_t device_type, const std::string & topic, mqtt_sub_function_p mqtt_subfunction)
             : device_type_(device_type)
             , topic_(topic)
diff --git a/src/shuntingYard.hpp b/src/shuntingYard.hpp
index 9fedd9f67..e2124db3d 100644
--- a/src/shuntingYard.hpp
+++ b/src/shuntingYard.hpp
@@ -68,7 +68,6 @@ std::deque<Token> exprToTokens(const std::string & expr) {
                 ++p;
             }
             const auto s = std::string(b, p);
-            // TODO check works with emplace_back
             tokens.emplace_back(Token::Type::String, s, -3);
             if (*p == '\0') {
                 --p;
@@ -79,7 +78,6 @@ std::deque<Token> exprToTokens(const std::string & expr) {
                 ++p;
             }
             const auto s = std::string(b, p);
-            // TODO check works with emplace_back
             tokens.emplace_back(Token::Type::String, s, -2);
             --p;
         } else if (*p == '"') {
@@ -209,7 +207,6 @@ std::deque<Token> exprToTokens(const std::string & expr) {
                 break;
             }
             const auto s = std::string(1, c);
-            // TODO check works with emplace_back
             tokens.emplace_back(token, s, precedence, rightAssociative);
         }
     }
@@ -223,7 +220,6 @@ std::deque<Token> shuntingYard(const std::deque<Token> & tokens) {
     std::vector<Token> stack;
 
     // While there are tokens to be read:
-    // TODO check still works with const reference
     for (auto const & token : tokens) {
         // Read a token
         switch (token.type) {
diff --git a/src/telegram.h b/src/telegram.h
index bb96be76c..892d7a6a9 100644
--- a/src/telegram.h
+++ b/src/telegram.h
@@ -285,7 +285,7 @@ class RxService : public EMSbus {
         const std::shared_ptr<const Telegram> telegram_;
 
         ~QueuedRxTelegram() = default;
-        // TODO check if still works without std::shared_ptr<Telegram> && telegram
+        // removed && from telegram in 3.7.0-dev.43
         QueuedRxTelegram(uint16_t id, std::shared_ptr<Telegram> telegram)
             : id_(id)
             , telegram_(std::move(telegram)) {
@@ -415,7 +415,7 @@ class TxService : public EMSbus {
         const uint16_t                        validateid_;
 
         ~QueuedTxTelegram() = default;
-        // TODO test this refactor, removing && from std::shared_ptr<Telegram> && telegram
+        // replaced && im std::shared_ptr<Telegram> telegram in 3.7.0-dev.43
         QueuedTxTelegram(uint16_t id, std::shared_ptr<Telegram> telegram, bool retry, uint16_t validateid)
             : id_(id)
             , telegram_(std::move(telegram))