diff --git a/esp32/include/HomieConfiguration.h b/esp32/include/HomieConfiguration.h
index da632c2..c0d42b4 100644
--- a/esp32/include/HomieConfiguration.h
+++ b/esp32/include/HomieConfiguration.h
@@ -39,23 +39,23 @@ HomieNode stayAlive("stay", "alive", "alive");
  */
 
 HomieSetting<long> deepSleepTime("deepsleep", "time in milliseconds to sleep (0 deactivats it)");
-HomieSetting<long> deepSleepNightTime("nightsleep", "time in milliseconds to sleep (0 usese same setting: deepsleep at night, too)");
+HomieSetting<long> deepSleepNightTime("nightsleep", "time in milliseconds to sleep (0 uses same setting: deepsleep at night, too)");
 HomieSetting<long> wateringDeepSleep("pumpdeepsleep", "time seconds to sleep, while a pump is running");
 
-HomieSetting<long> waterLevelMax("watermaxlevel", "distance at maximum water level");
-HomieSetting<long> waterLevelMin("waterminlevel", "distance at minimum water level (pumps still covered)");
-HomieSetting<long> waterLevelWarn("waterlevelwarn", "warn if below this water level %");
-HomieSetting<long> waterLevelVol("waterVolume", "ml between minimum and maximum");
+HomieSetting<long> waterLevelMax("watermaxlevel", "distance (mm) at maximum water level");
+HomieSetting<long> waterLevelMin("waterminlevel", "distance (mm) at minimum water level (pumps still covered)");
+HomieSetting<long> waterLevelWarn("waterlevelwarn", "warn (mm) if below this water level %");
+HomieSetting<long> waterLevelVol("waterVolume", "(ml) between minimum and maximum");
 
 /** Plant specific ones */
 
 #define GENERATE_PLANT(plant, strplant)   \
         HomieSetting<long> mSensorDry##plant = HomieSetting<long>("moistdry" strplant, "Plant " strplant "- Moist sensor dry threshold"); \
         HomieSetting<long> mSensorWet##plant = HomieSetting<long>("moistwet" strplant, "Plant" strplant " - Moist sensor wet threshold"); \
-        HomieSetting<long> mPumpAllowedHourRangeStart##plant = HomieSetting<long>("rangehourstart" strplant, "Plant" strplant " - Range pump allowed hour start"); \
-        HomieSetting<long> mPumpAllowedHourRangeEnd##plant = HomieSetting<long>("rangehourend" strplant, "Plant" strplant " - Range pump allowed hour end"); \
+        HomieSetting<long> mPumpAllowedHourRangeStart##plant = HomieSetting<long>("rangehourstart" strplant, "Plant" strplant " - Range pump allowed hour start (0-23)"); \
+        HomieSetting<long> mPumpAllowedHourRangeEnd##plant = HomieSetting<long>("rangehourend" strplant, "Plant" strplant " - Range pump allowed hour end (0-23)"); \
         HomieSetting<bool> mPumpOnlyWhenLowLight##plant = HomieSetting<bool>("onlyWhenLowLightZ" strplant, "Plant" strplant " - Enable the Pump only, when there is light but not enought to charge battery"); \
-        HomieSetting<long> mPumpCooldownInHours##plant = HomieSetting<long>("cooldownpump" strplant, "Plant" strplant " - How long to wait until the pump is activated again"); \
+        HomieSetting<long> mPumpCooldownInHours##plant = HomieSetting<long>("cooldownpump" strplant, "Plant" strplant " - How long to wait until the pump is activated again (minutes)"); \
         PlantSettings_t mSetting##plant = { &mSensorDry##plant, &mSensorWet##plant, &mPumpAllowedHourRangeStart##plant, &mPumpAllowedHourRangeEnd##plant, &mPumpOnlyWhenLowLight##plant, &mPumpCooldownInHours##plant };
         
 GENERATE_PLANT(0, "0");
diff --git a/esp32/src/PlantCtrl.cpp b/esp32/src/PlantCtrl.cpp
index e8199fa..ef1ca71 100644
--- a/esp32/src/PlantCtrl.cpp
+++ b/esp32/src/PlantCtrl.cpp
@@ -28,16 +28,16 @@ void Plant::init(void) {
     this->mSetting->pSensorWet->setValidator([] (long candidate) {
         return ((candidate >= 0) && (candidate <= 4095) );
     });
-    this->mSetting->pPumpAllowedHourRangeStart->setDefaultValue(8);
+    this->mSetting->pPumpAllowedHourRangeStart->setDefaultValue(8); // start at 8:00
     this->mSetting->pPumpAllowedHourRangeStart->setValidator([] (long candidate) {
         return ((candidate >= 0) && (candidate <= 23) );
     });
-    this->mSetting->pPumpAllowedHourRangeEnd->setDefaultValue(20);
+    this->mSetting->pPumpAllowedHourRangeEnd->setDefaultValue(20); // stop pumps at 20:00
     this->mSetting->pPumpAllowedHourRangeEnd->setValidator([] (long candidate) {
         return ((candidate >= 0) && (candidate <= 23) );
     });
     this->mSetting->pPumpOnlyWhenLowLight->setDefaultValue(true);
-    this->mSetting->pPumpCooldownInHours->setDefaultValue(20);
+    this->mSetting->pPumpCooldownInHours->setDefaultValue(20); // minutes
     this->mSetting->pPumpCooldownInHours->setValidator([] (long candidate) {
         return ((candidate >= 0) && (candidate <= 1024) );
     });
diff --git a/esp32/src/main.cpp b/esp32/src/main.cpp
index 212ad93..19822ee 100644
--- a/esp32/src/main.cpp
+++ b/esp32/src/main.cpp
@@ -342,9 +342,15 @@ void setup() {
   Homie.setLoopFunction(loopHandler);
 
   mConfigured = Homie.isConfigured();
-  // Load the settings
-  deepSleepTime.setDefaultValue(0);
+  // Set default values
+  deepSleepTime.setDefaultValue(300000);    /* 5 minutes in milliseconds */
   deepSleepNightTime.setDefaultValue(0);
+  wateringDeepSleep.setDefaultValue(60000); /* 1 minute in milliseconds */
+
+  waterLevelMax.setDefaultValue(1000);    /* 100cm in mm */
+  waterLevelMin.setDefaultValue(50);      /* 5cm in mm */
+  waterLevelWarn.setDefaultValue(500);    /* 50cm in mm */
+  waterLevelVol.setDefaultValue(5000);    /* 5l in ml */
 
   if (mConfigured) {
     // Advertise topics