diff --git a/embedded/www/tool.html b/embedded/www/tool.html
index 2a9fab6..680d259 100644
--- a/embedded/www/tool.html
+++ b/embedded/www/tool.html
@@ -10,7 +10,7 @@
         <table width="100%">
             <tr>
                 <td>
-                    <a class="btnimg" href="https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x" target="_blank">
+                    <a class="btnimg" href="https://github.com/MarlinFirmware/Marlin" target="_blank">
                    <svg width='1em' height='1em' viewBox='0 0 1300 1200'>
                     <g transform='translate(50,1200) scale(1, -1)'>
                     <path  d='M600 1174q33 0 74 -5l38 -152l5 -1q49 -14 94 -39l5 -2l134 80q61 -48 104 -105l-80 -134l3 -5q25 -44 39 -93l1 -6l152 -38q5 -43 5 -73q0 -34 -5 -74l-152 -38l-1 -6q-15 -49 -39 -93l-3 -5l80 -134q-48 -61 -104 -105l-134 81l-5 -3q-44 -25 -94 -39l-5 -2l-38 -151 q-43 -5 -74 -5q-33 0 -74 5l-38 151l-5 2q-49 14 -94 39l-5 3l-134 -81q-60 48 -104 105l80 134l-3 5q-25 45 -38 93l-2 6l-151 38q-6 42 -6 74q0 33 6 73l151 38l2 6q13 48 38 93l3 5l-80 134q47 61 105 105l133 -80l5 2q45 25 94 39l5 1l38 152q43 5 74 5zM600 815 q-89 0 -152 -63t-63 -151.5t63 -151.5t152 -63t152 63t63 151.5t-63 151.5t-152 63z'></path>
diff --git a/src/command.cpp b/src/command.cpp
index 8aa46fb..a5cc29e 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -153,7 +153,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
             Preferences prefs;
             prefs.begin(NAMESPACE, true);
             String defV = DEFAULT_STA_SSID;
-            espresponse->println(prefs.getString(STA_SSID_ENTRY, defV).c_str());
+            espresponse->println(prefs.getString(STA_SSID_ENTRY, defV));
             prefs.end();
         } else { //set
 #ifdef ENABLE_AUTHENTICATION
@@ -306,7 +306,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
             defV = DEFAULT_STA_MK;
             int32_t MK = prefs.getInt(STA_MK_ENTRY, WiFiConfig::IP_int_from_string(defV));
             defV = "IP:" + WiFiConfig::IP_string_from_int(IP) + ", GW:" + WiFiConfig::IP_string_from_int(GW) + ", MSK:" + WiFiConfig::IP_string_from_int(MK);
-            espresponse->println(defV.c_str());
+            espresponse->println(defV);
             prefs.end();
         } else { //set
 #ifdef ENABLE_AUTHENTICATION
@@ -380,7 +380,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
             Preferences prefs;
             prefs.begin(NAMESPACE, true);
             String defV = DEFAULT_AP_SSID;
-            espresponse->println(prefs.getString(AP_SSID_ENTRY, defV).c_str());
+            espresponse->println(prefs.getString(AP_SSID_ENTRY, defV));
             prefs.end();
         } else { //set
 #ifdef ENABLE_AUTHENTICATION
@@ -391,7 +391,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
                 return false;
             }
 #endif
-            if (!WiFiConfig::isSSIDValid (parameter.c_str() ) ) {
+            if (!WiFiConfig::isSSIDValid (parameter.c_str()) ) {
                 if(espresponse) {
                     espresponse->println ("Error: Incorrect SSID!");
                 }
@@ -423,7 +423,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         }
 #endif
         parameter = get_param (cmd_params, "", true);
-        if (!WiFiConfig::isPasswordValid (parameter.c_str() ) ) {
+        if (!WiFiConfig::isPasswordValid (parameter.c_str()) ) {
             if(espresponse) {
                 espresponse->println ("Error: Incorrect password!");
             }
@@ -466,7 +466,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
             //IP
             String defV = DEFAULT_AP_IP;
             int32_t IP = prefs.getInt(AP_IP_ENTRY, WiFiConfig::IP_int_from_string(defV));
-            espresponse->println(WiFiConfig::IP_string_from_int(IP).c_str());
+            espresponse->println(WiFiConfig::IP_string_from_int(IP));
             prefs.end();
         } else { //set
 #ifdef ENABLE_AUTHENTICATION
@@ -518,7 +518,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
             Preferences prefs;
             prefs.begin(NAMESPACE, true);
             int8_t channel = prefs.getChar(AP_CHANNEL_ENTRY, DEFAULT_AP_CHANNEL);
-            espresponse->println(String(channel).c_str());
+            espresponse->println(String(channel));
             prefs.end();
         } else { //set
 #ifdef ENABLE_AUTHENTICATION
@@ -631,7 +631,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
             return false;
         }
         String currentIP =  WiFiConfig::currentIP();
-        espresponse->println (currentIP.c_str());
+        espresponse->println (currentIP);
     }
     break;
 
@@ -655,7 +655,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
             Preferences prefs;
             prefs.begin(NAMESPACE, true);
             String defV = DEFAULT_HOSTNAME;
-            espresponse->println(prefs.getString(HOSTNAME_ENTRY, defV).c_str());
+            espresponse->println(prefs.getString(HOSTNAME_ENTRY, defV));
             prefs.end();
         } else { //set host name
 #ifdef ENABLE_AUTHENTICATION
@@ -762,7 +762,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
             Preferences prefs;
             prefs.begin(NAMESPACE, true);
             int port = prefs.getUShort(HTTP_PORT_ENTRY, DEFAULT_WEBSERVER_PORT);
-            espresponse->println(String(port).c_str());
+            espresponse->println(String(port));
             prefs.end();
         } else { //set
 #ifdef ENABLE_AUTHENTICATION
@@ -815,7 +815,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
             resp="No SD card";
         }
 #endif
-        espresponse->println (resp.c_str());
+        espresponse->println (resp);
     }
     break;
     //Get full ESP3D settings
@@ -841,11 +841,11 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         espresponse->print ("{\"F\":\"network\",\"P\":\"");
         espresponse->print (HOSTNAME_ENTRY);
         espresponse->print ("\",\"T\":\"S\",\"V\":\"");
-        espresponse->print (v.c_str());
+        espresponse->print (v);
         espresponse->print ("\",\"H\":\"Hostname\" ,\"S\":\"");
-        espresponse->print (String(MAX_HOSTNAME_LENGTH).c_str());
+        espresponse->print (String(MAX_HOSTNAME_LENGTH));
         espresponse->print ("\", \"M\":\"");
-        espresponse->print (String(MIN_HOSTNAME_LENGTH).c_str());
+        espresponse->print (String(MIN_HOSTNAME_LENGTH));
         espresponse->print ("\"}");
         espresponse->print (",");
 
@@ -854,7 +854,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         espresponse->print (HTTP_ENABLE_ENTRY);
         espresponse->print ("\",\"T\":\"B\",\"V\":\"");
         vi = prefs.getChar(HTTP_ENABLE_ENTRY, 1);
-        espresponse->print (String(vi).c_str());
+        espresponse->print (String(vi));
         espresponse->print ("\",\"H\":\"HTTP protocol\",\"O\":[{\"Enabled\":\"1\"},{\"Disabled\":\"0\"}]}");
         espresponse->print (",");
 
@@ -862,11 +862,11 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         espresponse->print ("{\"F\":\"network\",\"P\":\"");
         espresponse->print (HTTP_PORT_ENTRY);
         espresponse->print ("\",\"T\":\"I\",\"V\":\"");
-        espresponse->print (String(prefs.getUShort(HTTP_PORT_ENTRY, DEFAULT_WEBSERVER_PORT)).c_str());
+        espresponse->print (String(prefs.getUShort(HTTP_PORT_ENTRY, DEFAULT_WEBSERVER_PORT)));
         espresponse->print ("\",\"H\":\"HTTP Port\",\"S\":\"");
-        espresponse->print (String(MAX_HTTP_PORT).c_str());
+        espresponse->print (String(MAX_HTTP_PORT));
         espresponse->print ("\",\"M\":\"");
-        espresponse->print (String(MIN_HTTP_PORT).c_str());
+        espresponse->print (String(MIN_HTTP_PORT));
         espresponse->print ("\"}");
         espresponse->print (",");
 
@@ -897,7 +897,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         espresponse->print (ESP_RADIO_MODE);
         espresponse->print ("\",\"T\":\"B\",\"V\":\"");
         vi = prefs.getChar(ESP_RADIO_MODE, DEFAULT_RADIO_MODE);
-        espresponse->print (String(vi).c_str());
+        espresponse->print (String(vi));
         espresponse->print ("\",\"H\":\"Wifi mode\",\"O\":[{\"STA\":\"1\"},{\"AP\":\"2\"},{\"None\":\"0\"}]}");
         espresponse->print (",");
 
@@ -906,11 +906,11 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         espresponse->print (STA_SSID_ENTRY);
         espresponse->print ("\",\"T\":\"S\",\"V\":\"");
         defV = DEFAULT_STA_SSID;
-        espresponse->print (prefs.getString(STA_SSID_ENTRY, defV).c_str());
+        espresponse->print (prefs.getString(STA_SSID_ENTRY, defV));
         espresponse->print ("\",\"S\":\"");
-        espresponse->print (String(MAX_SSID_LENGTH).c_str());
+        espresponse->print (String(MAX_SSID_LENGTH));
         espresponse->print ("\",\"H\":\"Station SSID\",\"M\":\"");
-        espresponse->print (String(MIN_SSID_LENGTH).c_str());
+        espresponse->print (String(MIN_SSID_LENGTH));
         espresponse->print ("\"}");
         espresponse->print (",");
 
@@ -920,9 +920,9 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         espresponse->print ("\",\"T\":\"S\",\"V\":\"");
         espresponse->print (HIDDEN_PASSWORD);
         espresponse->print ("\",\"S\":\"");
-        espresponse->print (String(MAX_PASSWORD_LENGTH).c_str());
+        espresponse->print (String(MAX_PASSWORD_LENGTH));
         espresponse->print ("\",\"H\":\"Station Password\",\"M\":\"");
-        espresponse->print (String(MIN_PASSWORD_LENGTH).c_str());
+        espresponse->print (String(MIN_PASSWORD_LENGTH));
         espresponse->print ("\"}");
         espresponse->print (",");
 
@@ -930,7 +930,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         espresponse->print ("{\"F\":\"network\",\"P\":\"");
         espresponse->print (STA_IP_MODE_ENTRY);
         espresponse->print ("\",\"T\":\"B\",\"V\":\"");
-        espresponse->print (String(prefs.getChar(STA_IP_MODE_ENTRY, DEFAULT_STA_IP_MODE)).c_str());
+        espresponse->print (String(prefs.getChar(STA_IP_MODE_ENTRY, DEFAULT_STA_IP_MODE)));
         espresponse->print ("\",\"H\":\"Station IP Mode\",\"O\":[{\"DHCP\":\"0\"},{\"Static\":\"1\"}]}");
         espresponse->print (",");
 
@@ -938,7 +938,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         espresponse->print ("{\"F\":\"network\",\"P\":\"");
         espresponse->print (STA_IP_ENTRY);
         espresponse->print ("\",\"T\":\"A\",\"V\":\"");
-        espresponse->print (WiFiConfig::IP_string_from_int(prefs.getInt(STA_IP_ENTRY, 0)).c_str());
+        espresponse->print (WiFiConfig::IP_string_from_int(prefs.getInt(STA_IP_ENTRY, 0)));
         espresponse->print ("\",\"H\":\"Station Static IP\"}");
         espresponse->print (",");
 
@@ -946,7 +946,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         espresponse->print ("{\"F\":\"network\",\"P\":\"");
         espresponse->print (STA_GW_ENTRY);
         espresponse->print ("\",\"T\":\"A\",\"V\":\"");
-        espresponse->print (WiFiConfig::IP_string_from_int(prefs.getInt(STA_GW_ENTRY, 0)).c_str());
+        espresponse->print (WiFiConfig::IP_string_from_int(prefs.getInt(STA_GW_ENTRY, 0)));
         espresponse->print ("\",\"H\":\"Station Static Gateway\"}");
         espresponse->print (",");
 
@@ -954,7 +954,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         espresponse->print ("{\"F\":\"network\",\"P\":\"");
         espresponse->print (STA_MK_ENTRY);
         espresponse->print ("\",\"T\":\"A\",\"V\":\"");
-        espresponse->print (WiFiConfig::IP_string_from_int(prefs.getInt(STA_MK_ENTRY, 0)).c_str());
+        espresponse->print (WiFiConfig::IP_string_from_int(prefs.getInt(STA_MK_ENTRY, 0)));
         espresponse->print ("\",\"H\":\"Station Static Mask\"}");
         espresponse->print (",");
 
@@ -963,11 +963,11 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         espresponse->print (AP_SSID_ENTRY);
         espresponse->print ("\",\"T\":\"S\",\"V\":\"");
         defV = DEFAULT_AP_SSID;
-        espresponse->print (prefs.getString(AP_SSID_ENTRY, defV).c_str());
+        espresponse->print (prefs.getString(AP_SSID_ENTRY, defV));
         espresponse->print ("\",\"S\":\"");
-        espresponse->print (String(MAX_SSID_LENGTH).c_str());
+        espresponse->print (String(MAX_SSID_LENGTH));
         espresponse->print ("\",\"H\":\"AP SSID\",\"M\":\"");
-        espresponse->print (String(MIN_SSID_LENGTH).c_str());
+        espresponse->print (String(MIN_SSID_LENGTH));
         espresponse->print ("\"}");
         espresponse->print (",");
 
@@ -977,9 +977,9 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         espresponse->print ("\",\"T\":\"S\",\"V\":\"");
         espresponse->print (HIDDEN_PASSWORD);
         espresponse->print ("\",\"S\":\"");
-        espresponse->print (String(MAX_PASSWORD_LENGTH).c_str());
+        espresponse->print (String(MAX_PASSWORD_LENGTH));
         espresponse->print ("\",\"H\":\"AP Password\",\"M\":\"");
-        espresponse->print (String(MIN_PASSWORD_LENGTH).c_str());
+        espresponse->print (String(MIN_PASSWORD_LENGTH));
         espresponse->print ("\"}");
         espresponse->print (",");
 
@@ -996,13 +996,13 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         espresponse->print ("{\"F\":\"network\",\"P\":\"");
         espresponse->print (AP_CHANNEL_ENTRY);
         espresponse->print ("\",\"T\":\"B\",\"V\":\"");
-        espresponse->print (String(prefs.getChar(AP_CHANNEL_ENTRY, DEFAULT_AP_CHANNEL)).c_str());
+        espresponse->print (String(prefs.getChar(AP_CHANNEL_ENTRY, DEFAULT_AP_CHANNEL)));
         espresponse->print ("\",\"H\":\"AP Channel\",\"O\":[");
         for (int i = MIN_CHANNEL; i <= MAX_CHANNEL ; i++) {
             espresponse->print ("{\"");
-            espresponse->print (String(i).c_str());
+            espresponse->print (String(i));
             espresponse->print ("\":\"");
-            espresponse->print (String(i).c_str());
+            espresponse->print (String(i));
             espresponse->print ("\"}");
             if (i < MAX_CHANNEL) {
                 espresponse->print (",");
@@ -1154,9 +1154,9 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
                     espresponse->print (",");
                 }
                 espresponse->print ("{\"SSID\":\"");
-                espresponse->print (WiFi.SSID (i).c_str());
+                espresponse->print (WiFi.SSID (i));
                 espresponse->print ("\",\"SIGNAL\":\"");
-                espresponse->print (String(WiFiConfig::getSignal (WiFi.RSSI (i) )).c_str());
+                espresponse->print (String(WiFiConfig::getSignal (WiFi.RSSI (i) )));
                 espresponse->print ("\",\"IS_PROTECTED\":\"");
 
                 if (WiFi.encryptionType (i) == WIFI_AUTH_OPEN) {
@@ -1189,24 +1189,24 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         Preferences prefs;
         prefs.begin(NAMESPACE, true);
         espresponse->print ("Chip ID: ");
-        espresponse->print (String ( (uint16_t) (ESP.getEfuseMac() >> 32) ).c_str());
+        espresponse->print (String ( (uint16_t) (ESP.getEfuseMac() >> 32) ));
         espresponse->print ("\n");
         espresponse->print ("CPU Frequency: ");
-        espresponse->print (String (ESP.getCpuFreqMHz() ).c_str());
+        espresponse->print (String (ESP.getCpuFreqMHz() ));
         espresponse->print ("Mhz");
         espresponse->print ("\n");
         espresponse->print ("CPU Temperature: ");
-        espresponse->print (String (temperatureRead(), 1).c_str());
+        espresponse->print (String (temperatureRead(), 1));
         espresponse->print ("C");
         espresponse->print ("\n");
         espresponse->print ("Free memory: ");
-        espresponse->print (ESPResponseStream::formatBytes (ESP.getFreeHeap()).c_str());
+        espresponse->print (ESPResponseStream::formatBytes (ESP.getFreeHeap()));
         espresponse->print ("\n");
         espresponse->print ("SDK: ");
         espresponse->print (ESP.getSdkVersion());
         espresponse->print ("\n");
         espresponse->print ("Flash Size: ");
-        espresponse->print (ESPResponseStream::formatBytes (ESP.getFlashChipSize()).c_str());
+        espresponse->print (ESPResponseStream::formatBytes (ESP.getFlashChipSize()));
         espresponse->print ("\n");
         espresponse->print ("Available Size for update: ");
         size_t  flashsize = 0;
@@ -1220,13 +1220,13 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
                 }
             }
         }
-        espresponse->print (ESPResponseStream::formatBytes (flashsize).c_str());
+        espresponse->print (ESPResponseStream::formatBytes (flashsize));
         espresponse->print ("\n");
         espresponse->print ("Available Size for SPIFFS: ");
-        espresponse->print (ESPResponseStream::formatBytes (SPIFFS.totalBytes()).c_str());
+        espresponse->print (ESPResponseStream::formatBytes (SPIFFS.totalBytes()));
         espresponse->print ("\n");
         espresponse->print ("Baud rate: ");
-        espresponse->print (String(ESPResponseStream::baudRate()).c_str());
+        espresponse->print (String(ESPResponseStream::baudRate()));
         espresponse->print ("\n");
         espresponse->print ("Sleep mode: ");
         if (WiFi.getSleep()) {
@@ -1236,33 +1236,33 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
         }
         espresponse->print ("\n");
         espresponse->print ("Web port: ");
-        espresponse->print (String( prefs.getUShort(HTTP_PORT_ENTRY, DEFAULT_WEBSERVER_PORT)).c_str());
+        espresponse->print (String( prefs.getUShort(HTTP_PORT_ENTRY, DEFAULT_WEBSERVER_PORT)));
         espresponse->print ("\n");
         /*espresponse->print ("Data port: ");
-        //if (_data_port!=0)espresponse->print (String(_data_port).c_str());
+        //if (_data_port!=0)espresponse->print (String(_data_port));
         //else
         espresponse->print ("Disabled");
         espresponse->print ("\n");*/
         espresponse->print ("Hostname: ");
         String defV = DEFAULT_HOSTNAME;
-        espresponse->print ( prefs.getString(HOSTNAME_ENTRY, defV).c_str());
+        espresponse->print ( prefs.getString(HOSTNAME_ENTRY, defV));
         espresponse->print ("\n");
         espresponse->print ("Active Mode: ");
         if (WiFi.getMode() == WIFI_STA) {
             espresponse->print ("STA (");
-            espresponse->print ( WiFi.macAddress().c_str());
+            espresponse->print ( WiFi.macAddress());
             espresponse->print (")");
             espresponse->print ("\n");
             espresponse->print ("Connected to: ");
             if (WiFi.isConnected()) { //in theory no need but ...
-                espresponse->print (WiFi.SSID().c_str());
+                espresponse->print (WiFi.SSID());
                 espresponse->print ("\n");
                 espresponse->print ("Signal: ");
-                espresponse->print ( String(WiFiConfig::getSignal (WiFi.RSSI())).c_str());
+                espresponse->print ( String(WiFiConfig::getSignal (WiFi.RSSI())));
                 espresponse->print ("%");
                 espresponse->print ("\n");
                 uint8_t PhyMode;
-                esp_wifi_get_protocol (ESP_IF_WIFI_STA, &PhyMode);
+                esp_wifi_get_protocol (WIFI_IF_STA, &PhyMode);
                 espresponse->print ("Phy Mode: ");
                 if (PhyMode == (WIFI_PROTOCOL_11B | WIFI_PROTOCOL_11G | WIFI_PROTOCOL_11N)) {
                     espresponse->print ("11n");
@@ -1275,7 +1275,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
                 }
                 espresponse->print ("\n");
                 espresponse->print ("Channel: ");
-                espresponse->print (String (WiFi.channel()).c_str());
+                espresponse->print (String (WiFi.channel()));
                 espresponse->print ("\n");
                 espresponse->print ("IP Mode: ");
                 tcpip_adapter_dhcp_status_t dhcp_status;
@@ -1287,30 +1287,30 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
                 }
                 espresponse->print ("\n");
                 espresponse->print ("IP: ");
-                espresponse->print (WiFi.localIP().toString().c_str());
+                espresponse->print (WiFi.localIP().toString());
                 espresponse->print ("\n");
                 espresponse->print ("Gateway: ");
-                espresponse->print (WiFi.gatewayIP().toString().c_str());
+                espresponse->print (WiFi.gatewayIP().toString());
                 espresponse->print ("\n");
                 espresponse->print ("Mask: ");
-                espresponse->print (WiFi.subnetMask().toString().c_str());
+                espresponse->print (WiFi.subnetMask().toString());
                 espresponse->print ("\n");
                 espresponse->print ("DNS: ");
-                espresponse->print (WiFi.dnsIP().toString().c_str());
+                espresponse->print (WiFi.dnsIP().toString());
                 espresponse->print ("\n");
             } //this is web command so connection => no command
             espresponse->print ("Disabled Mode: ");
             espresponse->print ("AP (");
-            espresponse->print (WiFi.softAPmacAddress().c_str());
+            espresponse->print (WiFi.softAPmacAddress());
             espresponse->print (")");
             espresponse->print ("\n");
         } else if (WiFi.getMode() == WIFI_AP) {
             espresponse->print ("AP (");
-            espresponse->print (WiFi.softAPmacAddress().c_str());
+            espresponse->print (WiFi.softAPmacAddress());
             espresponse->print (")");
             espresponse->print ("\n");
             wifi_config_t conf;
-            esp_wifi_get_config (ESP_IF_WIFI_AP, &conf);
+            esp_wifi_get_config (WIFI_IF_STA, &conf);
             espresponse->print ("SSID: ");
             espresponse->print ((const char*) conf.ap.ssid);
             espresponse->print ("\n");
@@ -1331,7 +1331,7 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
             }
             espresponse->print ("\n");
             espresponse->print ("Max Connections: ");
-            espresponse->print (String(conf.ap.max_connection).c_str());
+            espresponse->print (String(conf.ap.max_connection));
             espresponse->print ("\n");
             espresponse->print ("DHCP Server: ");
             tcpip_adapter_dhcp_status_t dhcp_status;
@@ -1343,43 +1343,43 @@ bool COMMAND::execute_internal_command (int cmd, String cmd_params, level_authen
             }
             espresponse->print ("\n");
             espresponse->print ("IP: ");
-            espresponse->print (WiFi.softAPIP().toString().c_str());
+            espresponse->print (WiFi.softAPIP().toString());
             espresponse->print ("\n");
             tcpip_adapter_ip_info_t ip_AP;
             tcpip_adapter_get_ip_info (TCPIP_ADAPTER_IF_AP, &ip_AP);
             espresponse->print ("Gateway: ");
-            espresponse->print (IPAddress (ip_AP.gw.addr).toString().c_str());
+            espresponse->print (IPAddress (ip_AP.gw.addr).toString());
             espresponse->print ("\n");
             espresponse->print ("Mask: ");
-            espresponse->print (IPAddress (ip_AP.netmask.addr).toString().c_str());
+            espresponse->print (IPAddress (ip_AP.netmask.addr).toString());
             espresponse->print ("\n");
             espresponse->print ("Connected clients: ");
             wifi_sta_list_t station;
             tcpip_adapter_sta_list_t tcpip_sta_list;
             esp_wifi_ap_get_sta_list (&station);
             tcpip_adapter_get_sta_list (&station, &tcpip_sta_list);
-            espresponse->print (String(station.num).c_str());
+            espresponse->print (String(station.num));
             espresponse->print ("\n");
             for (int i = 0; i < station.num; i++) {
                 espresponse->print (ESPResponseStream::mac2str(tcpip_sta_list.sta[i].mac));
                 espresponse->print (" ");
-                espresponse->print ( IPAddress (tcpip_sta_list.sta[i].ip.addr).toString().c_str());
+                espresponse->print ( IPAddress (tcpip_sta_list.sta[i].ip.addr).toString());
                 espresponse->print ("\n");
             }
             espresponse->print ("Disabled Mode: ");
             espresponse->print ("STA (");
-            espresponse->print (WiFi.macAddress().c_str());
+            espresponse->print (WiFi.macAddress());
             espresponse->print (")");
             espresponse->print ("\n");
         } else if (WiFi.getMode() == WIFI_AP_STA) { //we should not be in this state but just in case ....
             espresponse->print ("Mixed");
             espresponse->print ("\n");
             espresponse->print ("STA (");
-            espresponse->print (WiFi.macAddress().c_str());
+            espresponse->print (WiFi.macAddress());
             espresponse->print (")");
             espresponse->print ("\n");
             espresponse->print ("AP (");
-            espresponse->print (WiFi.softAPmacAddress().c_str());
+            espresponse->print (WiFi.softAPmacAddress());
             espresponse->print (")");
             espresponse->print ("\n");
 
diff --git a/src/esp3dlibconfig.h b/src/esp3dlibconfig.h
index d537f98..9daae59 100644
--- a/src/esp3dlibconfig.h
+++ b/src/esp3dlibconfig.h
@@ -106,7 +106,19 @@
 #define STATIC_MODE   1
 
 //defaults values
+#ifndef DEFAULT_HOSTNAME
+#ifdef WIFI_HOSTNAME
+// Marlin firmware specific.
+#define DEFAULT_HOSTNAME WIFI_HOSTNAME
+#endif
+#ifdef DEFAULT_WIFI_HOSTNAME
+// Marlin firmware specific.
+#define DEFAULT_HOSTNAME DEFAULT_WIFI_HOSTNAME
+#endif
+#ifndef DEFAULT_HOSTNAME
 #define DEFAULT_HOSTNAME "marlinesp"
+#endif
+#endif
 #ifndef WIFI_SSID
 #define DEFAULT_STA_SSID "MARLIN_ESP"
 #define DEFAULT_RADIO_MODE ESP_WIFI_AP
diff --git a/src/espcom.h b/src/espcom.h
index 90308d9..274d334 100644
--- a/src/espcom.h
+++ b/src/espcom.h
@@ -50,7 +50,9 @@ class ESPResponseStream
 {
 public:
     void print(const char *data);
+    inline void print(const String& data) { print( data.c_str() ); }
     void println(const char *data);
+    inline void println(const String& data) { print( data.c_str() ); }
     void flush();
     tpipe pipe()
     {
@@ -76,5 +78,6 @@ class Esp3DCom
 {
 public:
     static void echo(const char * data);
+    static inline void echo(const String& data) { echo(data.c_str()); }
 };
 #endif //ESPCOM_H
diff --git a/src/wificonfig.cpp b/src/wificonfig.cpp
index c5a966f..852aeed 100644
--- a/src/wificonfig.cpp
+++ b/src/wificonfig.cpp
@@ -180,7 +180,7 @@ void WiFiConfig::WiFiEvent(WiFiEvent_t event)
     switch (event) {
     case SYSTEM_EVENT_STA_GOT_IP:
         Esp3DCom::echo ("Connected");
-        Esp3DCom::echo(WiFi.localIP().toString().c_str());
+        Esp3DCom::echo(WiFi.localIP().toString());
         break;
     case SYSTEM_EVENT_STA_DISCONNECTED:
         Esp3DCom::echo("WiFi not connected");
@@ -357,7 +357,7 @@ bool WiFiConfig::StartAP()
         Esp3DLibConfig::wait (100);
         //Set static IP
         WiFi.softAPConfig(ip, gw, mask);
-        Esp3DCom::echo(WiFi.softAPIP().toString().c_str());
+        Esp3DCom::echo(WiFi.softAPIP().toString());
         return true;
     } else {
         Esp3DCom::echo("Starting AP failed");