Index: source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- source/ariba/overlay/BaseOverlay.cpp	(revision 5748)
+++ source/ariba/overlay/BaseOverlay.cpp	(revision 5750)
@@ -277,6 +277,5 @@
 
 	// create relay link descriptor
-	LinkDescriptor* rld = getRelayDescriptor(remoteNode);
-	NodeID relayNode = rld != NULL ? rld->remoteNode : NodeID::UNSPECIFIED;
+	NodeID relayNode = getRelayNode(remoteNode);
 
 	// add descriptor
@@ -330,5 +329,5 @@
 
 	// timer for auto link management
-	Timer::setInterval( 500 );
+	Timer::setInterval( 1000 );
 	Timer::start();
 
Index: source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- source/ariba/overlay/modules/chord/Chord.cpp	(revision 5748)
+++ source/ariba/overlay/modules/chord/Chord.cpp	(revision 5750)
@@ -57,5 +57,5 @@
 
 	// create routing table
-	this->table = new chord_routing_table(_nodeid, 4);
+	this->table = new chord_routing_table(_nodeid, 2);
 	orphan_removal_counter = 0;
 	discovery_count = 0;
@@ -124,5 +124,5 @@
 		dmsg.setSourceRelay(baseoverlay.getRelayNode(nodeid));
 		dmsg.setFollowType(Discovery::successor);
-		dmsg.setTTL((uint8_t)3);
+		dmsg.setTTL((uint8_t)2);
 		cmsg.encapsulate(&dmsg);
 		send(&cmsg, lnk);
@@ -135,5 +135,5 @@
 		dmsg.setSourceRelay(baseoverlay.getRelayNode(nodeid));
 		dmsg.setFollowType(Discovery::predecessor);
-		dmsg.setTTL((uint8_t)3);
+		dmsg.setTTL((uint8_t)2);
 		cmsg.encapsulate(&dmsg);
 		send(&cmsg, lnk);
@@ -220,6 +220,6 @@
 		// all nodes that I know, fingers, succ/pred
 		for (size_t i = 0; i < table->size(); i++){
-			if (/*(*table)[i]->ref_count != 0
-					&&*/ !(*table)[i]->info.isUnspecified())
+			if ((*table)[i]->ref_count != 0
+					&& !(*table)[i]->info.isUnspecified())
 				nodelist.push_back((*table)[i]->id);
 		}
@@ -267,5 +267,4 @@
 
 	discover_neighbors( lnk );
-	send_discovery_to(remote);
 
 	vector<LinkID>::iterator it = std::find(bootstrapLinks.begin(), bootstrapLinks.end(), lnk);