diff --git a/tools/esp8266/config.h b/tools/esp8266/config.h
index ab633f9a..bfbfeb86 100644
--- a/tools/esp8266/config.h
+++ b/tools/esp8266/config.h
@@ -6,21 +6,30 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
-// fallback WiFi info
+
+//-------------------------------------
+// WIFI CONFIGURATION
+//-------------------------------------
+
+// Fallback WiFi Info
 #define FB_WIFI_SSID    "YOUR_WIFI_SSID"
 #define FB_WIFI_PWD     "YOUR_WIFI_PWD"
 
 
-// access point info
+// Access Point Info
+// In case there is no WiFi Network or Ahoy can not connect to it, it will act as an Access Point
+
 #define WIFI_AP_SSID    "AHOY-DTU"
 #define WIFI_AP_PWD     "esp_8266"
-// stay in access point mode all the time
+
+// If the next line is uncommented, Ahoy will stay in access point mode all the time
 //#define AP_ONLY
 
 
 //-------------------------------------
 // CONFIGURATION - COMPILE TIME
 //-------------------------------------
+
 // time in seconds how long the station info (ssid + pwd) will be tried
 #define WIFI_TRY_CONNECT_TIME   30
 
@@ -31,7 +40,7 @@
 // default device name
 #define DEF_DEVICE_NAME         "AHOY-DTU"
 
-// default pinout
+// default pinout (GPIO Number)
 #define DEF_RF24_CS_PIN         15
 #define DEF_RF24_CE_PIN         2
 #define DEF_RF24_IRQ_PIN        0
@@ -76,7 +85,7 @@
 #define DEF_NTP_SERVER_NAME     "pool.ntp.org"
 
 // default NTP server port
-#define DEF_NTP_PORT            8888
+#define DEF_NTP_PORT            123
 
 // NTP refresh interval in ms (default 12h)
 #define NTP_REFRESH_INTERVAL    12 * 3600 * 1000
diff --git a/tools/esp8266/defines.h b/tools/esp8266/defines.h
index 33732ff5..210604a5 100644
--- a/tools/esp8266/defines.h
+++ b/tools/esp8266/defines.h
@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       5
-#define VERSION_PATCH       16
+#define VERSION_PATCH       17
 
 
 //-------------------------------------
diff --git a/tools/esp8266/hmDefines.h b/tools/esp8266/hmDefines.h
index 28615ed7..baec0f75 100644
--- a/tools/esp8266/hmDefines.h
+++ b/tools/esp8266/hmDefines.h
@@ -125,7 +125,7 @@ const byteAssign_t hm1chAssignment[] = {
     { FLD_PRA, UNIT_VA,  CH0, 20, 2, 10   },
     { FLD_F,   UNIT_HZ,  CH0, 16, 2, 100  },
     { FLD_T,   UNIT_C,   CH0, 26, 2, 10   },
-    { FLD_ALARM_MES_ID,   UNIT_NONE,   CH0, 28, 2, 1 },
+    { FLD_ALARM_MES_ID,   UNIT_NONE,   CH0, 24, 2, 1 },
     { FLD_YD,  UNIT_WH,  CH0, CALC_YD_CH0,  0, CMD_CALC },
     { FLD_YT,  UNIT_KWH, CH0, CALC_YT_CH0,  0, CMD_CALC },
     { FLD_PDC, UNIT_W,   CH0, CALC_PDC_CH0, 0, CMD_CALC },