diff --git a/src/vscp/common/dm.cpp b/src/vscp/common/dm.cpp
index 67a27b471..461197a89 100644
--- a/src/vscp/common/dm.cpp
+++ b/src/vscp/common/dm.cpp
@@ -7724,7 +7724,7 @@ bool CDM::loadFromXML( void )
 
     wxXmlDocument doc;
     if ( !doc.Load ( m_staticXMLPath ) ) {
-        gpobj->logMsg( _("[DM] ") + _("Faild to load DM. Check format!\n"), 
+        gpobj->logMsg( _("[DM] ") + _("Failed to load DM. Check format!\n"), 
                         DAEMON_LOGMSG_NORMAL, DAEMON_LOGTYPE_DM );
         return false;
     }
diff --git a/src/vscp/common/old/udpthread.cpp b/src/vscp/common/old/udpthread.cpp
index a531500b5..82a37ef4f 100644
--- a/src/vscp/common/old/udpthread.cpp
+++ b/src/vscp/common/old/udpthread.cpp
@@ -175,7 +175,7 @@ void *UDPSendThread::Entry()
             sizeof( on));
 
         if (1 == bind(m_sendsock, (struct sockaddr*) &addr, sizeof( addr))) {
-            m_pCtrlObject->logMsg(_("vscpd: Faild to bind send socket. Functionality disabled."), DAEMON_LOGMSG_ERROR);
+            m_pCtrlObject->logMsg(_("vscpd: Failed to bind send socket. Functionality disabled."), DAEMON_LOGMSG_ERROR);
 #ifdef WIN32
             if (NULL != m_sendsock) closesocket(m_sendsock);
             m_sendsock = NULL;
@@ -187,7 +187,7 @@ void *UDPSendThread::Entry()
         }
 
     } else {
-        m_pCtrlObject->logMsg(_("vscpd: Faild to create send socket. Functionality disabled."), DAEMON_LOGMSG_ERROR);
+        m_pCtrlObject->logMsg(_("vscpd: Failed to create send socket. Functionality disabled."), DAEMON_LOGMSG_ERROR);
 #ifdef WIN32
         m_sendsock = NULL;
 #else
diff --git a/src/vscp/common/tcpipsrv.cpp b/src/vscp/common/tcpipsrv.cpp
index 5ccf0dc6c..616e3442c 100644
--- a/src/vscp/common/tcpipsrv.cpp
+++ b/src/vscp/common/tcpipsrv.cpp
@@ -2430,7 +2430,7 @@ void TCPClientThread::handleChallenge( void )
     memset( m_pClientItem->m_sid, 0, sizeof( m_pClientItem->m_sid ) );
     if ( !gpobj->generateSessionId( (const char *)m_pClientItem->m_currentCommand.mbc_str(), 
                                     m_pClientItem->m_sid ) ) {
-        write( MSG_FAILD_TO_GENERATE_SID, strlen ( MSG_FAILD_TO_GENERATE_SID ) );
+        write( MSG_FAILED_TO_GENERATE_SID, strlen ( MSG_FAILED_TO_GENERATE_SID ) );
         return; 
     }
     
diff --git a/src/vscp/common/tcpipsrv.h b/src/vscp/common/tcpipsrv.h
index 3317238e4..02d12bf35 100644
--- a/src/vscp/common/tcpipsrv.h
+++ b/src/vscp/common/tcpipsrv.h
@@ -93,7 +93,7 @@ WX_DECLARE_LIST( struct stcp_connection, TCPIPCLIENTS );
 #define MSG_VARIABLE_NOT_DEFINED            "-OK - Variable is not defined.\r\n"
 #define MSG_MOT_ALLOWED_TO_SEND_EVENT       "-OK - Not allowed to sen this event (contact admin).\r\n"
 #define MSG_INVALID_PATH                    "-OK - Invalid path.\r\n"
-#define MSG_FAILD_TO_GENERATE_SID           "-OK - Failed to generate sid.\r\n"
+#define MSG_FAILED_TO_GENERATE_SID          "-OK - Failed to generate sid.\r\n"
 
 #define MSG_FAILED_TO_CREATE_TABLE          "-OK - Failed to create (one or more) table(s).\r\n"
 #define MSG_FAILED_TO_ADD_TABLE_TO_DB       "-OK - Failed to add table to database.\r\n"
diff --git a/src/vscp/common/version.h b/src/vscp/common/version.h
index 64a3cbfac..32acab960 100644
--- a/src/vscp/common/version.h
+++ b/src/vscp/common/version.h
@@ -34,10 +34,10 @@
 // I M P O T A N T ! ! ! Lines below must be located at line 35/36/37/40/42/43    I M P O T A N T ! ! !
 #define VSCPD_MAJOR_VERSION     13
 #define VSCPD_MINOR_VERSION     1
-#define VSCPD_RELEASE_VERSION   0
-#define VSCPD_BUILD_VERSION     14
+#define VSCPD_RELEASE_VERSION   1
+#define VSCPD_BUILD_VERSION     0
 
-#define VSCPD_DISPLAY_VERSION "13.1.0.14 Aluminium"
+#define VSCPD_DISPLAY_VERSION "13.1.1.0 Aluminium"
 
 #define VSCPD_COPYRIGHT "Copyright (C) 2000-2018, Grodans Paradis AB, https://www.grodansparadis.com"
 #define VSCPD_COPYRIGHT_HTML "Copyright (C) 2000-2018, <a href=\"mailto:info@grodansparadis.com\">Grodans Paradis AB</a>, <a hrefs=\"https://www.grodansparadis.com\">https://www.grodansparadis.com</a>"
diff --git a/src/vscp/common/websocket.h b/src/vscp/common/websocket.h
index 93256186f..981e466ac 100644
--- a/src/vscp/common/websocket.h
+++ b/src/vscp/common/websocket.h
@@ -79,20 +79,20 @@ enum {
     WEBSOCK_ERROR_TABLE_LOG_MISSING_VALUE,      // Missing value 
     WEBSOCK_ERROR_TABLE_LOG_FAILED,             // Failed to log data
     WEBSOCK_ERROR_TABLE_NEED_SQL,               // Missing SQL expression   
-    WEBSOCK_ERROR_TABLE_FAILD_COMMAND_RECORDS,  // Failed to get # records 
-    WEBSOCK_ERROR_TABLE_FAILD_COMMAND_FIRSTDATE,// Failed to get first date  
-    WEBSOCK_ERROR_TABLE_FAILD_COMMAND_LASTDATE, // Failed to get last date
-    WEBSOCK_ERROR_TABLE_FAILD_COMMAND_SUM,      // Failed to get sum
-    WEBSOCK_ERROR_TABLE_FAILD_COMMAND_MIN,      // Failed to get min
-    WEBSOCK_ERROR_TABLE_FAILD_COMMAND_MAX,      // Failed to get max
-    WEBSOCK_ERROR_TABLE_FAILD_COMMAND_AVERAGE,  // Failed to get average
-    WEBSOCK_ERROR_TABLE_FAILD_COMMAND_MEDIAN,   // Failed to get median
-    WEBSOCK_ERROR_TABLE_FAILD_COMMAND_STDDEV,   // Failed to get stddev
-    WEBSOCK_ERROR_TABLE_FAILD_COMMAND_VARIANCE, // Failed to get variance
-    WEBSOCK_ERROR_TABLE_FAILD_COMMAND_MODE,     // Failed to get mode
-    WEBSOCK_ERROR_TABLE_FAILD_COMMAND_UPPERQ,   // Failed to get upperq
-    WEBSOCK_ERROR_TABLE_FAILD_COMMAND_LOWERQ,   // Failed to get lowerq
-    WEBSOCK_ERROR_TABLE_FAILD_COMMAND_CLEAR     // Failed to clear entries
+    WEBSOCK_ERROR_TABLE_FAILED_COMMAND_RECORDS,  // Failed to get # records 
+    WEBSOCK_ERROR_TABLE_FAILED_COMMAND_FIRSTDATE,// Failed to get first date  
+    WEBSOCK_ERROR_TABLE_FAILED_COMMAND_LASTDATE, // Failed to get last date
+    WEBSOCK_ERROR_TABLE_FAILED_COMMAND_SUM,      // Failed to get sum
+    WEBSOCK_ERROR_TABLE_FAILED_COMMAND_MIN,      // Failed to get min
+    WEBSOCK_ERROR_TABLE_FAILED_COMMAND_MAX,      // Failed to get max
+    WEBSOCK_ERROR_TABLE_FAILED_COMMAND_AVERAGE,  // Failed to get average
+    WEBSOCK_ERROR_TABLE_FAILED_COMMAND_MEDIAN,   // Failed to get median
+    WEBSOCK_ERROR_TABLE_FAILED_COMMAND_STDDEV,   // Failed to get stddev
+    WEBSOCK_ERROR_TABLE_FAILED_COMMAND_VARIANCE, // Failed to get variance
+    WEBSOCK_ERROR_TABLE_FAILED_COMMAND_MODE,     // Failed to get mode
+    WEBSOCK_ERROR_TABLE_FAILED_COMMAND_UPPERQ,   // Failed to get upperq
+    WEBSOCK_ERROR_TABLE_FAILED_COMMAND_LOWERQ,   // Failed to get lowerq
+    WEBSOCK_ERROR_TABLE_FAILED_COMMAND_CLEAR     // Failed to clear entries
 };
 
 #define	WEBSOCK_STR_ERROR_NO_ERROR                      "Everything is OK"
@@ -114,28 +114,28 @@ enum {
 #define WEBSOCK_STR_ERROR_TABLE_NO_DATA                 "No data in table"
 #define WEBSOCK_STR_ERROR_TABLE_ERROR_READING           "Error reading table"
 #define WEBSOCK_STR_ERROR_TABLE_CREATE_FORMAT           "Table create format was wrong"
-#define WEBSOCK_STR_ERROR_TABLE_DELETE_FAILED           "Table delete faild"
-#define WEBSOCK_STR_ERROR_TABLE_LIST_FAILED             "Table list faild"
+#define WEBSOCK_STR_ERROR_TABLE_DELETE_FAILED           "Table delete failed"
+#define WEBSOCK_STR_ERROR_TABLE_LIST_FAILED             "Table list failed"
 #define WEBSOCK_STR_ERROR_TABLE_FAILED_TO_GET           "Failed to get table (is it available?)"
 #define WEBSOCK_STR_ERROR_TABLE_FAILED_GET_DATA         "Failed to get table data"
 #define WEBSOCK_STR_ERROR_TABLE_FAILED_CLEAR            "Failed to clear table"
 #define WEBSOCK_STR_ERROR_TABLE_LOG_MISSING_VALUE       "A value is needed"
 #define WEBSOCK_STR_ERROR_TABLE_LOG_FAILED              "Failed to log data"
 #define WEBSOCK_STR_ERROR_TABLE_NEED_SQL                "Missing SQL expression"
-#define WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_RECORDS   "Faild to get number of records"
-#define WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_FIRSTDATE "Faild to get first date"
-#define WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_LASTDATE  "Faild to get last date"
-#define WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_SUM       "Faild to get sum"
-#define WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_MIN       "Faild to get min"
-#define WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_MAX       "Faild to get max"
-#define WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_AVERAGE   "Faild to get average"
-#define WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_MEDIAN    "Faild to get median"
-#define WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_STDDEV    "Faild to get stddev"
-#define WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_VARIANCE  "Faild to get variance"
-#define WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_MODE      "Faild to get mode"
-#define WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_UPPERQ    "Faild to get upperq"
-#define WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_LOWERQ    "Faild to get lowerq"
-#define WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_CLEAR     "Faild to clear table enteries"
+#define WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_RECORDS   "Failed to get number of records"
+#define WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_FIRSTDATE "Failed to get first date"
+#define WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_LASTDATE  "Failed to get last date"
+#define WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_SUM       "Failed to get sum"
+#define WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_MIN       "Failed to get min"
+#define WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_MAX       "Failed to get max"
+#define WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_AVERAGE   "Failed to get average"
+#define WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_MEDIAN    "Failed to get median"
+#define WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_STDDEV    "Failed to get stddev"
+#define WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_VARIANCE  "Failed to get variance"
+#define WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_MODE      "Failed to get mode"
+#define WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_UPPERQ    "Failed to get upperq"
+#define WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_LOWERQ    "Failed to get lowerq"
+#define WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_CLEAR     "Failed to clear table enteries"
 
 WX_DECLARE_LIST(vscpEventFilter, TRIGGERLIST);
 
diff --git a/src/vscp/common/websocketsrv.cpp b/src/vscp/common/websocketsrv.cpp
index b4757802e..c8a8d6388 100644
--- a/src/vscp/common/websocketsrv.cpp
+++ b/src/vscp/common/websocketsrv.cpp
@@ -3582,8 +3582,8 @@ ws1_command( struct web_connection *conn,
         double count;
         if ( !pTable->getNumberOfRecordsForRange( wxStart, wxEnd, &count ) ) { 
             wxstr = wxString::Format( _("-;TBL_RECORDS;%d;%s"),
-                                            (int)WEBSOCK_ERROR_TABLE_FAILD_COMMAND_RECORDS,
-                                            WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_RECORDS );
+                                            (int)WEBSOCK_ERROR_TABLE_FAILED_COMMAND_RECORDS,
+                                            WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_RECORDS );
             
             web_websocket_write( conn, 
                                     WEB_WEBSOCKET_OPCODE_TEXT,
@@ -3709,8 +3709,8 @@ ws1_command( struct web_connection *conn,
         wxDateTime first;
         if ( !pTable->getFirstDate( first ) ) {
             wxstr = wxString::Format( _("-;TBL_FIRSTDATE;%d;%s"),
-                                            (int)WEBSOCK_ERROR_TABLE_FAILD_COMMAND_FIRSTDATE,
-                                            WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_FIRSTDATE );
+                                            (int)WEBSOCK_ERROR_TABLE_FAILED_COMMAND_FIRSTDATE,
+                                            WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_FIRSTDATE );
             
             web_websocket_write( conn, 
                                     WEB_WEBSOCKET_OPCODE_TEXT,
@@ -3835,8 +3835,8 @@ ws1_command( struct web_connection *conn,
         wxDateTime last;
         if ( !pTable->getLastDate( last ) ) {
             wxstr = wxString::Format( _("-;TBL_LASTDATE;%d;%s"),
-                                            (int)WEBSOCK_ERROR_TABLE_FAILD_COMMAND_LASTDATE,
-                                            WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_LASTDATE );
+                                            (int)WEBSOCK_ERROR_TABLE_FAILED_COMMAND_LASTDATE,
+                                            WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_LASTDATE );
             
             web_websocket_write( conn, 
                                     WEB_WEBSOCKET_OPCODE_TEXT,
@@ -3961,8 +3961,8 @@ ws1_command( struct web_connection *conn,
         double sum;
         if ( !pTable->getSumValue( wxStart, wxEnd, &sum ) ) {
             wxstr = wxString::Format( _("-;TBL_SUM;%d;%s"),
-                                            (int)WEBSOCK_ERROR_TABLE_FAILD_COMMAND_SUM,
-                                            WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_SUM );
+                                            (int)WEBSOCK_ERROR_TABLE_FAILED_COMMAND_SUM,
+                                            WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_SUM );
             
             web_websocket_write( conn, 
                                     WEB_WEBSOCKET_OPCODE_TEXT,
@@ -4087,8 +4087,8 @@ ws1_command( struct web_connection *conn,
         double min;
         if ( !pTable->getMinValue( wxStart, wxEnd, &min ) ) {
             wxstr = wxString::Format( _("-;TBL_MIN;%d;%s"),
-                                            (int)WEBSOCK_ERROR_TABLE_FAILD_COMMAND_MIN,
-                                            WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_MIN );
+                                            (int)WEBSOCK_ERROR_TABLE_FAILED_COMMAND_MIN,
+                                            WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_MIN );
             
             web_websocket_write( conn, 
                                     WEB_WEBSOCKET_OPCODE_TEXT,
@@ -4213,8 +4213,8 @@ ws1_command( struct web_connection *conn,
         double max;
         if ( !pTable->getMaxValue( wxStart, wxEnd, &max ) ) {
             wxstr = wxString::Format( _("-;TBL_MAX;%d;%s"),
-                                            (int)WEBSOCK_ERROR_TABLE_FAILD_COMMAND_MAX,
-                                            WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_MAX );
+                                            (int)WEBSOCK_ERROR_TABLE_FAILED_COMMAND_MAX,
+                                            WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_MAX );
             
             web_websocket_write( conn, 
                                     WEB_WEBSOCKET_OPCODE_TEXT,
@@ -4339,8 +4339,8 @@ ws1_command( struct web_connection *conn,
         double average;
         if ( !pTable->getSumValue( wxStart, wxEnd, &average ) ) {
             wxstr = wxString::Format( _("-;TBL_AVERAGE;%d;%s"),
-                                  (int)WEBSOCK_ERROR_TABLE_FAILD_COMMAND_AVERAGE,
-                                  WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_AVERAGE );
+                                  (int)WEBSOCK_ERROR_TABLE_FAILED_COMMAND_AVERAGE,
+                                  WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_AVERAGE );
             
             web_websocket_write( conn, 
                                     WEB_WEBSOCKET_OPCODE_TEXT,
@@ -4465,8 +4465,8 @@ ws1_command( struct web_connection *conn,
         double median;
         if ( !pTable->getMedianValue( wxStart, wxEnd, &median ) ) {
             wxstr = wxString::Format( _("-;TBL_MEDIAN;%d;%s"),
-                                    (int)WEBSOCK_ERROR_TABLE_FAILD_COMMAND_MEDIAN,
-                                    WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_MEDIAN );
+                                    (int)WEBSOCK_ERROR_TABLE_FAILED_COMMAND_MEDIAN,
+                                    WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_MEDIAN );
             
             web_websocket_write( conn, 
                                     WEB_WEBSOCKET_OPCODE_TEXT,
@@ -4591,8 +4591,8 @@ ws1_command( struct web_connection *conn,
         double stddev;
         if ( !pTable->getStdevValue( wxStart, wxEnd, &stddev ) ) {
             wxstr = wxString::Format( _("-;TBL_STDDEV;%d;%s"),
-                                            (int)WEBSOCK_ERROR_TABLE_FAILD_COMMAND_STDDEV,
-                                            WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_STDDEV );
+                                            (int)WEBSOCK_ERROR_TABLE_FAILED_COMMAND_STDDEV,
+                                            WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_STDDEV );
             
             web_websocket_write( conn, 
                                     WEB_WEBSOCKET_OPCODE_TEXT,
@@ -4717,8 +4717,8 @@ ws1_command( struct web_connection *conn,
         double variance;
         if ( !pTable->getVarianceValue( wxStart, wxEnd, &variance ) ) {
             wxstr = wxString::Format( _("-;TBL_VARIANCE;%d;%s"),
-                                            (int)WEBSOCK_ERROR_TABLE_FAILD_COMMAND_VARIANCE,
-                                            WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_VARIANCE );
+                                            (int)WEBSOCK_ERROR_TABLE_FAILED_COMMAND_VARIANCE,
+                                            WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_VARIANCE );
             
             web_websocket_write( conn, 
                                     WEB_WEBSOCKET_OPCODE_TEXT,
@@ -4843,8 +4843,8 @@ ws1_command( struct web_connection *conn,
         double mode;
         if ( !pTable->getModeValue( wxStart, wxEnd, &mode ) ) {
             wxstr = wxString::Format( _("-;TBL_MODE;%d;%s"),
-                                            (int)WEBSOCK_ERROR_TABLE_FAILD_COMMAND_MODE,
-                                            WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_MODE );
+                                            (int)WEBSOCK_ERROR_TABLE_FAILED_COMMAND_MODE,
+                                            WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_MODE );
             
             web_websocket_write( conn, 
                                     WEB_WEBSOCKET_OPCODE_TEXT,
@@ -4969,8 +4969,8 @@ ws1_command( struct web_connection *conn,
         double lowerq;
         if ( !pTable->getLowerQuartileValue( wxStart, wxEnd, &lowerq ) ) {
             wxstr = wxString::Format( _("-;TBL_LOWERQ;%d;%s"),
-                                            (int)WEBSOCK_ERROR_TABLE_FAILD_COMMAND_LOWERQ,
-                                            WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_LOWERQ );
+                                            (int)WEBSOCK_ERROR_TABLE_FAILED_COMMAND_LOWERQ,
+                                            WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_LOWERQ );
             
             web_websocket_write( conn, 
                                     WEB_WEBSOCKET_OPCODE_TEXT,
@@ -5095,8 +5095,8 @@ ws1_command( struct web_connection *conn,
         double upperq;
         if ( !pTable->getUppeQuartileValue( wxStart, wxEnd, &upperq ) ) {
             wxstr = wxString::Format( _("-;TBL_UPPERQ;%d;%s"),
-                                            (int)WEBSOCK_ERROR_TABLE_FAILD_COMMAND_UPPERQ,
-                                            WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_UPPERQ );
+                                            (int)WEBSOCK_ERROR_TABLE_FAILED_COMMAND_UPPERQ,
+                                            WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_UPPERQ );
             
             web_websocket_write( conn, 
                                     WEB_WEBSOCKET_OPCODE_TEXT,
@@ -5226,8 +5226,8 @@ ws1_command( struct web_connection *conn,
         if ( bClearAll ) {
             if ( !pTable->clearTable() ) {
                 wxstr = wxString::Format( _("-;TBL_CLEAR;%d;%s"),
-                                            (int)WEBSOCK_ERROR_TABLE_FAILD_COMMAND_CLEAR,
-                                            WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_CLEAR );
+                                            (int)WEBSOCK_ERROR_TABLE_FAILED_COMMAND_CLEAR,
+                                            WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_CLEAR );
             
                 web_websocket_write( conn, 
                                     WEB_WEBSOCKET_OPCODE_TEXT,
@@ -5240,8 +5240,8 @@ ws1_command( struct web_connection *conn,
         else {
             if ( !pTable->clearTableRange( wxStart, wxEnd ) ) {
                 wxstr = wxString::Format( _("-;TBL_CLEAR;%d;%s"),
-                                            (int)WEBSOCK_ERROR_TABLE_FAILD_COMMAND_CLEAR,
-                                            WEBSOCK_STR_ERROR_TABLE_FAILD_COMMAND_CLEAR );
+                                            (int)WEBSOCK_ERROR_TABLE_FAILED_COMMAND_CLEAR,
+                                            WEBSOCK_STR_ERROR_TABLE_FAILED_COMMAND_CLEAR );
             
                 web_websocket_write( conn, 
                                     WEB_WEBSOCKET_OPCODE_TEXT,
diff --git a/src/vscp/common/websrv.cpp b/src/vscp/common/websrv.cpp
index 04abd448e..e5255aa17 100644
--- a/src/vscp/common/websrv.cpp
+++ b/src/vscp/common/websrv.cpp
@@ -981,7 +981,7 @@ vscp_password( struct web_connection *conn, void *cbdata )
                   "Content-Type: text/html; charset=utf-8\r\n"
                   "Connection: close\r\n\r\n");
 
-    web_printf( conn, WEB_COMMON_HEAD, "Password generation" );
+    web_printf( conn, WEB_COMMON_HEAD, "Password key generation" );
     web_printf( conn, WEB_STYLE_START );
     web_write( conn, WEB_COMMON_CSS, strlen( WEB_COMMON_CSS ) );    // CSS style Code
     web_printf( conn, WEB_STYLE_END );
@@ -1007,8 +1007,10 @@ vscp_password( struct web_connection *conn, void *cbdata )
         }
     }
 
-    web_printf( conn, "<h1 id=\"header\">Password generation</h1><br>" );
+    web_printf( conn, "<h1 id=\"header\">Password key generation</h1><br>" );
         
+    web_printf( conn, "<p>Enter clear text password to generate key.</p>" );
+
     if ( 0 == strlen( password ) ) {
         web_printf( conn, "<form action=\"/vscp/password\"><table>" );
         web_printf( conn, "<tr><td width=\"10%%\"><b>Password</b></td><td><input type=\"password\" "
@@ -8378,7 +8380,7 @@ vscp_configure_list( struct web_connection *conn, void *cbdata )
     wxMemorySize memsize;
     if ( -1 != ( memsize = wxGetFreeMemory() ) ) {
         web_printf( conn, "&nbsp;&nbsp;&nbsp;&nbsp;<b>Free memory:</b> ");
-        web_printf( conn, "%s", (const char *)memsize.ToString().mbc_str() );
+        web_printf( conn, "%s (%.2fM)", (const char *)memsize.ToString().mbc_str(), memsize.ToDouble()/1000000 );
         web_printf( conn, " bytes<br>");
     }
 
diff --git a/src/vscp/drivers/level1/peak/common/peakobj.cpp b/src/vscp/drivers/level1/peak/common/peakobj.cpp
index 9c43858fb..3c3d7a532 100644
--- a/src/vscp/drivers/level1/peak/common/peakobj.cpp
+++ b/src/vscp/drivers/level1/peak/common/peakobj.cpp
@@ -1299,7 +1299,7 @@ void *workThreadTransmit( void *pObject )
 
 				} // unable to allocate storage
 
-			} // faild to send message							
+			} // failed to send message							
 
 		} // while data
 
diff --git a/src/vscp/drivers/level1/xap/common/xapobj.cpp b/src/vscp/drivers/level1/xap/common/xapobj.cpp
index 95f0a1203..3bbbccb81 100644
--- a/src/vscp/drivers/level1/xap/common/xapobj.cpp
+++ b/src/vscp/drivers/level1/xap/common/xapobj.cpp
@@ -756,7 +756,7 @@ void *workThreadxAPClientSend( void *pObject )
 #else
 	if ( -1 == ( sock = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ) ) ) {
 
-                SYSLOG( LOG_CRIT, "xapdrv: Faild to create send socket.");
+                SYSLOG( LOG_CRIT, "xapdrv: Failed to create send socket.");
 
 		sock = 0;
 		pthread_exit( &errorCode );
@@ -890,7 +890,7 @@ void *workThreadTransmit( void *pObject )
 	
 	}
 	else {
-		//SYSLOG( LOG_CRIT, "canald: Faild to create send socket. Functionality disabled.");
+		//SYSLOG( LOG_CRIT, "canald: Failed to create send socket. Functionality disabled.");
 #ifdef WIN32
 		sock = NULL;
 		ExitThread( errorCode );
@@ -1276,7 +1276,7 @@ void *workThreadReceive( void *pObject )
 							sizeof ( on ) );
 		}
 		else {
-			//SYSLOG( LOG_CRIT, "canald: Faild to create send socket. Functionality disabled.");
+			//SYSLOG( LOG_CRIT, "canald: Failed to create send socket. Functionality disabled.");
 #ifdef WIN32
 			bcastsock = NULL;
 			ExitThread( errorCode );
diff --git a/src/vscp/drivers/level2/btdetect/win32/vscpbtdetect.cpp b/src/vscp/drivers/level2/btdetect/win32/vscpbtdetect.cpp
index 5edc3a241..bf65319bf 100644
--- a/src/vscp/drivers/level2/btdetect/win32/vscpbtdetect.cpp
+++ b/src/vscp/drivers/level2/btdetect/win32/vscpbtdetect.cpp
@@ -494,7 +494,7 @@ bool CVSCPBTDetectWrkTread::sendEvent( vscpEventEx& eventEx )
 #ifndef WIN32
             syslog( LOG_ERR,
                     "%s",
-                    ( const char * ) "Faild to convert event." );
+                    ( const char * ) "Failed to convert event." );
 #endif
             return false;
         }
diff --git a/src/vscp/testtools/testtcpinterface/testtcpinterfaceDlg.cpp b/src/vscp/testtools/testtcpinterface/testtcpinterfaceDlg.cpp
index edb411d85..307643611 100644
--- a/src/vscp/testtools/testtcpinterface/testtcpinterfaceDlg.cpp
+++ b/src/vscp/testtools/testtcpinterface/testtcpinterfaceDlg.cpp
@@ -808,7 +808,7 @@ void CTesttcpinterfaceDlg::OnButtonBinaryReceive()
 		}
 	}
 	else {
-		writeLog("Faild to open channel.\r\n");
+		writeLog("Failed to open channel.\r\n");
 	}
 
 	writeLog("Done.\r\n");
diff --git a/tests/dm/javascript/dm-enteries.xml b/tests/dm/javascript/dm-enteries.xml
index 3cc9e870f..edaa0ed32 100644
--- a/tests/dm/javascript/dm-enteries.xml
+++ b/tests/dm/javascript/dm-enteries.xml
@@ -204,7 +204,7 @@ Send event
           vscp_log("TurnOn event sent successfully!");
       }
       else {
-          vscp_log("Faild to send TurnOn event!");
+          vscp_log("Failed to send TurnOn event!");
       }              
 
 
@@ -293,7 +293,7 @@ if ( vscp_setFilter( filterObj ) ) {
   vscp_log("Filter set successfully!\n");
 }
 else {
-  vscp_log("Faild to set filter!\n");
+  vscp_log("Failed to set filter!\n");
 }