Index: sources/cloudsync/CloudSyncController.cpp
===================================================================
diff -u -r9d6db6aa45d632726da384e9ea3336fc2313c5e6 -r146db65b27df897c06dba90f24e6ac0f4f132456
--- sources/cloudsync/CloudSyncController.cpp	(.../CloudSyncController.cpp)	(revision 9d6db6aa45d632726da384e9ea3336fc2313c5e6)
+++ sources/cloudsync/CloudSyncController.cpp	(.../CloudSyncController.cpp)	(revision 146db65b27df897c06dba90f24e6ac0f4f132456)
@@ -374,6 +374,7 @@
     if ( message.paramCount < paramCount[id] )                                              { error = eError_ParamMissing   ; ok = false; goto lErr; }
 
     // convert the message id and check its validity
+    id = message.id; // keep the original recevied message id after we are done using the id for loggging.
     message.id = CS2UI(static_cast<MessageID_Enum>(message.id));
     if ( eMessageID_Start > message.id || message.id > eMessageID_Count )                   { error = eError_InvalidID      ; ok = false; goto lErr; }
 
@@ -383,6 +384,8 @@
     }
 
     vMessage = message;
+    LOG_APPED_CS(QString("%1,%2").arg(id).arg(message.params.join(',')));
+
     return true;
 
 lErr:
Index: sources/device/DeviceController.cpp
===================================================================
diff -u -r95d717f975007dad9c7ab1450863b1dfdf627790 -r146db65b27df897c06dba90f24e6ac0f4f132456
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 95d717f975007dad9c7ab1450863b1dfdf627790)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 146db65b27df897c06dba90f24e6ac0f4f132456)
@@ -879,11 +879,12 @@
 {
     DeviceError::Scripts_Error_Enum err = DeviceError::eDevice_OK;
     if ( vCreate ) {
-        if ( ! FileHandler::write(      vFile, "", false) ) { err = DeviceError::eDevice_Watch_Error_NotCreate; goto lErr; }
-    } else {
-        if ( ! QFileInfo::exists (      vFile           ) ) { err = DeviceError::eDevice_Watch_Error_NotFound ; goto lErr; }
-    }
-    if ( ! _fileSystemWatcher.addPath(  vFile           ) ) { err = DeviceError::eDevice_Watch_Error_NotAdded ; goto lErr; }
+        if ( ! FileHandler::write           (  vFile, "", false) ) { err = DeviceError::eDevice_Watch_Error_NotCreate; goto lErr;   }}
+    else {
+        if ( ! QFileInfo::exists            (  vFile           ) ) { err = DeviceError::eDevice_Watch_Error_NotFound ; goto lErr;   }}
+    if ( ! _fileSystemWatcher.removePath    (  vFile           ) ) { LOG_APPED_UI(QString("Device NOT watching  %1").arg(vFile));   }
+    else                                                           { LOG_APPED_UI(QString("Device watch removed %1").arg(vFile));   }
+    if ( ! _fileSystemWatcher.addPath       (  vFile           ) ) { err = DeviceError::eDevice_Watch_Error_NotAdded ; goto lErr;   }
 
     LOG_APPED_UI(QString("Device watch %1").arg(vFile));
     return;