diff --git a/src/bitdht/bdconnection.cc b/src/bitdht/bdconnection.cc
index 0e68e47..2329c78 100644
--- a/src/bitdht/bdconnection.cc
+++ b/src/bitdht/bdconnection.cc
@@ -35,13 +35,15 @@
 #include "util/bdrandom.h"
 
 /*
+ * #define DEBUG_PROXY_CONNECTION		1 
  * #define DEBUG_NODE_CONNECTION		1 
  * #define DEBUG_NODE_CONNECTION_EXTRA		1 
  * #define DEBUG_CONNECTION_DELAY		1
  */
 
-#define DEBUG_NODE_CONNECTION		1 
-#define DEBUG_CONNECTION_DELAY		1
+//#define DEBUG_PROXY_CONNECTION		1 
+//#define DEBUG_NODE_CONNECTION		1 
+//#define DEBUG_CONNECTION_DELAY		1
 
 
 #define BITDHT_CR_PAUSE_SHORT_PERIOD 1
diff --git a/src/bitdht/bdmanager.cc b/src/bitdht/bdmanager.cc
index a44c356..e0bb28b 100644
--- a/src/bitdht/bdmanager.cc
+++ b/src/bitdht/bdmanager.cc
@@ -312,11 +312,11 @@ void bdNodeManager::iteration()
 			 */
 			
 #define TRANSITION_OP_SPACE_SIZE	50 /* 1 query / sec, should take 12-15 secs */
-//#define MAX_FINDSELF_TIME		30
-//#define MIN_OP_SPACE_SIZE		10
+#define MAX_FINDSELF_TIME		30
+#define MIN_OP_SPACE_SIZE		10
 // testing parameters.
-#define MAX_FINDSELF_TIME		10
-#define MIN_OP_SPACE_SIZE		2   // for testing. self + oneother.
+//#define MAX_FINDSELF_TIME		10
+//#define MIN_OP_SPACE_SIZE		2   // for testing. self + oneother.
 
 			{
 				uint32_t nodeSpaceSize = mNodeSpace.calcSpaceSize();
@@ -403,8 +403,7 @@ void bdNodeManager::iteration()
 				/* run a random search for ourselves, from own App DHT peer */
 				QueryRandomLocalNet();
 
-//#define SEARCH_MAX_SIZE 10					
-#define SEARCH_MAX_SIZE 0
+#define SEARCH_MAX_SIZE 10					
  				if (mBdNetworkSize < SEARCH_MAX_SIZE)
 				{
 #ifdef DEBUG_MGR
diff --git a/src/bitdht/bdnode.cc b/src/bitdht/bdnode.cc
index 4213495..758cb89 100644
--- a/src/bitdht/bdnode.cc
+++ b/src/bitdht/bdnode.cc
@@ -60,9 +60,12 @@
 
  * #define DEBUG_NODE_MSGIN 1
  * #define DEBUG_NODE_MSGOUT 1
+ *
+ * #define DISABLE_BAD_PEER_FILTER		1
+ *
  ***/
 
-//#define DEBUG_NODE_MSGS 1
+//#define DISABLE_BAD_PEER_FILTER		1
 
 
 bdNode::bdNode(bdNodeId *ownId, std::string dhtVersion, std::string bootfile, bdDhtFunctions *fns)
@@ -461,9 +464,6 @@ void bdNode::send_connect_msg(bdId *id, int msgtype, bdId *srcAddr, bdId *destAd
 }
 
 
-
-#define DISABLE_BAD_PEER_FILTER		1
-
 void bdNode::checkPotentialPeer(bdId *id, bdId *src)
 {
 	/* Check BadPeer Filters for Potential Peers too */