diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp
index 7584d3753..c3ab9e431 100644
--- a/src/emsdevice.cpp
+++ b/src/emsdevice.cpp
@@ -114,7 +114,7 @@ std::string EMSdevice::device_type_2_device_name(const uint8_t device_type) {
 // returns device_type from a string
 uint8_t EMSdevice::device_name_2_device_type(const char * topic) {
     if (!topic) {
-        return DeviceType::UNKNOWN; // nullptr
+        return DeviceType::UNKNOWN;
     }
 
     // convert topic to lowercase and compare
diff --git a/src/locale_DE.h b/src/locale_DE.h
index 0899d40c4..859e4937d 100644
--- a/src/locale_DE.h
+++ b/src/locale_DE.h
@@ -269,7 +269,7 @@ MAKE_PSTR(bufferedflow, "Durchlaufspeicher")
 MAKE_PSTR(layeredbuffer, "Schichtspeicher")
 MAKE_PSTR(maintenance, "Wartung")
 MAKE_PSTR(heating, "Heizen")
-MAKE_PSTR(cooling, "Kühlen")
+MAKE_PSTR(cooling, "K�hlen")
 
 // boiler lists
 MAKE_PSTR_LIST(tpl_date, F("Format: < dd.mm.yyyy >")) // template for text input
@@ -312,7 +312,7 @@ MAKE_PSTR(winter, "Winter")
 MAKE_PSTR(outdoor, "Aussentemperatur")
 MAKE_PSTR_WORD(mpc)
 MAKE_PSTR(room, "Raum")
-MAKE_PSTR(room_outdoor, "Raum+Außen")
+MAKE_PSTR(room_outdoor, "Raum+Au�en")
 MAKE_PSTR(power, "Leistung")
 MAKE_PSTR(constant, "konstant")
 MAKE_PSTR(simple, "einfach")
diff --git a/src/web/WebAPIService.cpp b/src/web/WebAPIService.cpp
index 73df7ee19..0ae29df9b 100644
--- a/src/web/WebAPIService.cpp
+++ b/src/web/WebAPIService.cpp
@@ -16,8 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// SUrlParser from https://github.com/Mad-ness/simple-url-parser
-
 #include "emsesp.h"
 
 using namespace std::placeholders; // for `_1` etc
diff --git a/src/web/WebDataService.cpp b/src/web/WebDataService.cpp
index c32bed325..fc60055dc 100644
--- a/src/web/WebDataService.cpp
+++ b/src/web/WebDataService.cpp
@@ -74,10 +74,10 @@ void WebDataService::core_data(AsyncWebServerRequest * request) {
     JsonObject root     = response->getRoot();
 
     // list is already sorted by device type
-    // Ignore Contoller
     JsonArray devices = root.createNestedArray("devices");
     char      buffer[3];
     for (const auto & emsdevice : EMSESP::emsdevices) {
+        // ignore controller
         if (emsdevice && (emsdevice->device_type() != EMSdevice::DeviceType::CONTROLLER || emsdevice->count_entities() > 0)) {
             JsonObject obj = devices.createNestedObject();
             obj["id"]      = Helpers::smallitoa(buffer, emsdevice->unique_id()); // a unique id as a string