Index: source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- source/ariba/overlay/modules/chord/Chord.cpp	(revision 5660)
+++ source/ariba/overlay/modules/chord/Chord.cpp	(revision 5661)
@@ -306,6 +306,7 @@
 		// decapsulate message
 		Discovery* dmsg = m->decapsulate<Discovery> ();
-		logging_debug("received discovery message with"
-				<< " dest=" << m->getDestination().toString()
+		logging_info("received discovery message with"
+			    << " src=" << m->getSource().toString()
+				<< " dst=" << m->getDestination().toString()
 				<< " ttl=" << (int)dmsg->getTTL()
 				<< " type=" << (int)dmsg->getFollowType()
@@ -331,5 +332,5 @@
 					cmsg_s.encapsulate(&dmsg_s);
 					route_item* succ_item = table->get(*table->get_successor());
-					logging_debug("split: routing discovery message to successor "
+					logging_info("Discovery split: routing discovery message to successor "
 							<< succ_item->id.toString() );
 					send(&cmsg_s, succ_item->info);
@@ -344,5 +345,5 @@
 					route_item* pred_item = table->get(
 							*table->get_predesessor());
-					logging_debug("split: routing discovery message to predecessor "
+					logging_info("Discovery split: routing discovery message to predecessor "
 							<< pred_item->id.toString() );
 					send(&cmsg_p, pred_item->info);
@@ -437,5 +438,5 @@
 		// remove orphan links
 		orphan_removal_counter++;
-		if (orphan_removal_counter >= 2) {
+		if (orphan_removal_counter <0 || orphan_removal_counter >= 2) {
 			logging_info("Running orphan removal");
 			orphan_removal_counter = 0;