Index: /m4/ax_avahi.m4
===================================================================
--- /m4/ax_avahi.m4	(revision 4758)
+++ /m4/ax_avahi.m4	(revision 4762)
@@ -5,5 +5,5 @@
 # DESCRIPTION
 #
-#   Test for the Avahi library
+#   Test for the Avahi library. The library is optional!
 #
 # LAST MODIFICATION
@@ -13,14 +13,14 @@
 AC_DEFUN([AX_AVAHI],
 [
-  AC_CHECK_HEADERS(avahi-client/client.h,,
-    [AC_MSG_ERROR([Avahi Client Library not found. Install libavahi-client-dev])])
+  AC_CHECK_HEADERS(avahi-client/client.h,
+    [AC_MSG_NOTICE([Avahi Client Library found])], )
     
-  AC_CHECK_HEADERS(avahi-common/timeval.h,,
-    [AC_MSG_ERROR([Avahi Common Library not found. Install libavahi-common-dev])])
+  AC_CHECK_HEADERS(avahi-common/timeval.h,
+    [AC_MSG_NOTICE([Avahi Common Library found])], )
     
-  AC_CHECK_LIB([avahi-client],[avahi_entry_group_new],,
-    [AC_MSG_ERROR([Avahi Client Library not found. Install libavahi-client-dev])])
+  AC_CHECK_LIB([avahi-client],[avahi_entry_group_new],
+    [AC_MSG_NOTICE([Avahi Client Library found])], )
     
-  AC_CHECK_LIB([avahi-common],[avahi_free],,
-    [AC_MSG_ERROR([Avahi Client Library not found. Install libavahi-client-dev])])
+  AC_CHECK_LIB([avahi-common],[avahi_free],
+    [AC_MSG_NOTICE([Avahi Client Library found])], )
 ])
Index: /sample/pingpong/main.cpp
===================================================================
--- /sample/pingpong/main.cpp	(revision 4758)
+++ /sample/pingpong/main.cpp	(revision 4762)
@@ -7,5 +7,19 @@
 using ariba::application::pingpong::PingPong;
 
+#include "ariba/utility/bootstrap/BootstrapManager.h"
+using ariba::utility::BootstrapManager;
+
 int main( int argc, char** argv ) {
+
+
+	StartupWrapper::startSystem();
+	BootstrapManager::instance().registerModule(
+			BootstrapManager::BootstrapTypeMulticastDns);
+	BootstrapManager::instance().publish("testname", "testinfo");
+	getchar();
+	StartupWrapper::stopSystem();
+	return 0;
+
+
 
 	// get config file
@@ -27,15 +41,2 @@
 	return 0;
 }
-
-/* Chris's debugging stuff
-
-	#include "ariba/utility/bootstrap/BootstrapManager.h"
-	using ariba::utility::BootstrapManager;
-
-	StartupWrapper::startSystem();
-	BootstrapManager::instance().registerModule(
-			BootstrapManager::BootstrapTypeMulticastDns);
-	BootstrapManager::instance().publish("testname", "testinfo");
-	getchar();
-	return 0;
-*/
Index: /source/ariba/communication/BaseCommunication.cpp
===================================================================
--- /source/ariba/communication/BaseCommunication.cpp	(revision 4758)
+++ /source/ariba/communication/BaseCommunication.cpp	(revision 4762)
@@ -97,5 +97,5 @@
 		IPv4Locator* ipv4locator = dynamic_cast<IPv4Locator*>(*i);
 
-		// TODO: which locators are find to bind to?
+		// TODO: which locators can we find to bind to?
 		// localhost is not too bad, works when testing locally
 		// with several instances. the manual override currently
Index: /source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- /source/ariba/overlay/BaseOverlay.cpp	(revision 4758)
+++ /source/ariba/overlay/BaseOverlay.cpp	(revision 4762)
@@ -696,6 +696,5 @@
 	/* Handle spovnet instance join requests
 	 */
-	else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest) &&
-						state == BaseOverlayStateInitiator){
+	else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest) ){
 
 		logging_debug(
@@ -748,6 +747,5 @@
 		return true;
 
-	} // else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest)
-	  //          && state == BaseOverlayStateInitiator)
+	} // else if( overlayMsg->isType(OverlayMsg::OverlayMessageTypeJoinRequest))
 
 	/* ************************************************************************