diff --git a/libretroshare/src/ft/ftcontroller.cc b/libretroshare/src/ft/ftcontroller.cc
index 700b94684..325375ba0 100644
--- a/libretroshare/src/ft/ftcontroller.cc
+++ b/libretroshare/src/ft/ftcontroller.cc
@@ -170,9 +170,9 @@ void ftController::addFileSource(const RsFileHash& hash,const RsPeerId& peer_id)
 
     std::map<RsFileHash, ftFileControl*>::iterator it = mDownloads.find(hash);
 
-//#ifdef CONTROL_DEBUG
+#ifdef CONTROL_DEBUG
 	std::cerr << "ftController: Adding source " << peer_id << " to current download hash=" << hash ;
-//#endif
+#endif
 	if(it != mDownloads.end())
 	{
 		it->second->mTransfer->addFileSource(peer_id);
diff --git a/libretroshare/src/grouter/p3grouter.cc b/libretroshare/src/grouter/p3grouter.cc
index e1495fc11..953412e27 100644
--- a/libretroshare/src/grouter/p3grouter.cc
+++ b/libretroshare/src/grouter/p3grouter.cc
@@ -1516,9 +1516,9 @@ void p3GRouter::handleIncomingDataItem(RsGRouterGenericDataItem *data_item)
 #endif
         if(!verifySignedDataItem(data_item))	// we should get proper flags out of this
         {
-#ifdef GROUTER_DEBUG
             std::cerr << "    verifying item signature: FAILED! Droping that item" ;
-#endif
+            std::cerr << "    You probably received a message from a person you don't have key." << std::endl;
+            std::cerr << "    Signature key ID: " << data_item->signature.keyId << std::endl;
         return ;
         }
 #ifdef GROUTER_DEBUG
@@ -1814,11 +1814,12 @@ bool p3GRouter::verifySignedDataItem(RsGRouterAbstractMsgItem *item)
         {
             switch(error_status)
             {
-                case RsGixs::RS_GIXS_ERROR_KEY_NOT_AVAILABLE: std::cerr << "(EE) Key is not available. Cannot verify." << std::endl;
+                case RsGixs::RS_GIXS_ERROR_KEY_NOT_AVAILABLE: std::cerr << "(EE) Key for GXS Id " << item->signature.keyId << " is not available. Cannot verify." << std::endl;
                                         break ;
                 case RsGixs::RS_GIXS_ERROR_SIGNATURE_MISMATCH: std::cerr << "(EE) Signature mismatch. Spoofing/Corrupted/MITM?." << std::endl;
                                         break ;
-            default: break ;
+            default:  std::cerr << "(EE) Signature verification failed on GRouter message. Unknown error status: " << error_status << std::endl;
+                break ;
             }
             return false;
         }
diff --git a/libretroshare/src/serialiser/rsgxscommentitems.cc b/libretroshare/src/serialiser/rsgxscommentitems.cc
index 402967514..c6fb345f4 100644
--- a/libretroshare/src/serialiser/rsgxscommentitems.cc
+++ b/libretroshare/src/serialiser/rsgxscommentitems.cc
@@ -29,7 +29,7 @@
 #include "serialiser/rstlvbase.h"
 #include "serialiser/rsbaseserial.h"
 
-#define GXSCOMMENT_DEBUG	1
+//#define GXSCOMMENT_DEBUG	1
 
 
 uint32_t RsGxsCommentSerialiser::size(RsItem *item)
diff --git a/libretroshare/src/services/p3gxschannels.cc b/libretroshare/src/services/p3gxschannels.cc
index e59de17c6..afd4c1ef6 100644
--- a/libretroshare/src/services/p3gxschannels.cc
+++ b/libretroshare/src/services/p3gxschannels.cc
@@ -939,11 +939,15 @@ bool SSGxsChannelGroup::load(const std::string &input)
     }
     else
     {
+#ifdef GXSCHANNELS_DEBUG
         std::cerr << "SSGxsChannelGroup::load(): could not parse string \"" << input << "\"" << std::endl;
+#endif
         return false ;
     }
 
+#ifdef GXSCHANNELS_DEBUG
     std::cerr << "DECODED STRING: autoDL=" << mAutoDownload << ", directory=\"" << mDownloadDirectory << "\"" << std::endl;
+#endif
 
     return true;
 }
@@ -965,7 +969,9 @@ std::string SSGxsChannelGroup::save() const
         output += " {P:" + encoded_str + "}";
     }
 
+#ifdef GXSCHANNELS_DEBUG
     std::cerr << "ENCODED STRING: " << output << std::endl;
+#endif
 
     return output;
 }
diff --git a/libretroshare/src/services/p3idservice.cc b/libretroshare/src/services/p3idservice.cc
index 8eaa08928..6e8105770 100644
--- a/libretroshare/src/services/p3idservice.cc
+++ b/libretroshare/src/services/p3idservice.cc
@@ -718,9 +718,7 @@ bool p3IdService::validateData(const uint8_t *data,uint32_t data_size,const RsTl
 
     if(signature_key.keyData.bin_data == NULL)
     {
-#ifdef DEBUG_IDS
         std::cerr << "(EE) Cannot validate signature for unknown key " << signature.keyId << std::endl;
-#endif
         signing_error = RS_GIXS_ERROR_KEY_NOT_AVAILABLE ;
         return false;
     }
diff --git a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp
index b1316b310..cf9486ae5 100644
--- a/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp
+++ b/retroshare-gui/src/gui/settings/RSPermissionMatrixWidget.cpp
@@ -470,7 +470,7 @@ void RSPermissionMatrixWidget::paintEvent(QPaintEvent *)
       QString remote_status = remotely_allowed?tr("Enabled by remote peer"):tr("Disabled by remote peer") ;
 
       if(!service_perms.mDefaultAllowed)
-          local_status = tr("Switched Off") ;
+          local_status = tr("Globally switched Off") ;
 
       const QFont& font(_painter->font()) ;
       QFontMetrics fm(font);