Index: /sample/pingpong/PingPongMessage.h
===================================================================
--- /sample/pingpong/PingPongMessage.h	(revision 4617)
+++ /sample/pingpong/PingPongMessage.h	(revision 4618)
@@ -18,11 +18,11 @@
 public:
 	PingPongMessage();
-	PingPongMessage( uint8_t _id );
+	PingPongMessage( uint16_t _id );
 	virtual ~PingPongMessage();
 
 	string info();
-	uint8_t getid();
+	uint16_t getid();
 private:
-	uint8_t id;
+	uint16_t id; //TODO: was uint8_t
 };
 
Index: /source/ariba/communication/EndpointDescriptor.h
===================================================================
--- /source/ariba/communication/EndpointDescriptor.h	(revision 4617)
+++ /source/ariba/communication/EndpointDescriptor.h	(revision 4618)
@@ -100,5 +100,5 @@
 
 sznBeginDefault( ariba::communication::EndpointDescriptor, X ) {
-	uint8_t unspec = isUnspec;
+	uint16_t unspec = isUnspec; //TODO: was uint8_t
 
 	X && unspec && VO(locator);
Index: /source/ariba/communication/messages/AribaBaseMsg.h
===================================================================
--- /source/ariba/communication/messages/AribaBaseMsg.h	(revision 4617)
+++ /source/ariba/communication/messages/AribaBaseMsg.h	(revision 4618)
@@ -85,5 +85,5 @@
 
 private:
-	uint8_t state;		// the link message type
+	uint16_t state;		// the link message type //TODO: was uint8_t
 	LinkID localLink;	// the local link id
 	LinkID remoteLink;	// the remote link id
@@ -94,6 +94,5 @@
 
 sznBeginDefault( ariba::communication::AribaBaseMsg, X ) {
-	uint8_t x = 0xff;
-	X && state && x && &localLink && &remoteLink && Payload();
+	X && state && &localLink && &remoteLink && Payload();
 } sznEnd();
 
Index: /source/ariba/communication/modules/transport/tcp/TCPTransport.cpp
===================================================================
--- /source/ariba/communication/modules/transport/tcp/TCPTransport.cpp	(revision 4617)
+++ /source/ariba/communication/modules/transport/tcp/TCPTransport.cpp	(revision 4618)
@@ -203,10 +203,7 @@
 					// converting message
 					logging_debug( "converting message" );
-
-
-					std::cout << "XXXXXXXXXXXXreceived data on tcp transport: " << data << std::endl;
-
-
+					//std::cout << "XXXXXXXXXXXXreceived data on tcp transport: " << data << std::endl;
 					Message* msg = new Message(data);
+
 					std::ostringstream o;
 					o << (peer->get_ip_str() + 7) << ":" << remotePort;
@@ -243,10 +240,5 @@
 
 	Data data = data_serialize( message );
-
-
-	std::cout << "XXXXXXXXXXXXXsending out data using tcp transport: " << data << std::endl;
-
-
-
+	//std::cout << "XXXXXXXXXXXXXsending out data using tcp transport: " << data << std::endl;
 
 	const_cast<Message*>(message)->dropPayload();
Index: /source/ariba/overlay/messages/LinkRequest.h
===================================================================
--- /source/ariba/overlay/messages/LinkRequest.h	(revision 4617)
+++ /source/ariba/overlay/messages/LinkRequest.h	(revision 4618)
@@ -24,5 +24,5 @@
 private:
 	bool free_endpoint_;
-	uint8_t flags;
+	uint16_t flags; //TODO: was uint8_t
 	uint32_t nonce;
 	const EndpointDescriptor* endpoint;
Index: /source/ariba/overlay/messages/OverlayMsg.h
===================================================================
--- /source/ariba/overlay/messages/OverlayMsg.h	(revision 4617)
+++ /source/ariba/overlay/messages/OverlayMsg.h	(revision 4618)
@@ -90,5 +90,5 @@
 
 private:
-	uint8_t type;
+	uint16_t type; //TODO: was uint8_t
 	ServiceID service;
 	NodeID sourceNode;
Index: /source/ariba/overlay/modules/chord/messages/ChordMessage.h
===================================================================
--- /source/ariba/overlay/modules/chord/messages/ChordMessage.h	(revision 4617)
+++ /source/ariba/overlay/modules/chord/messages/ChordMessage.h	(revision 4618)
@@ -97,6 +97,6 @@
 
 private:
-	uint8_t type;
-	uint8_t hop_count;
+	uint16_t type; //TODO: was uint8_t
+	uint16_t hop_count; //TODO: was uint8_t
 	NodeID source, destination;
 };
Index: /source/ariba/overlay/modules/chord/messages/Discovery.h
===================================================================
--- /source/ariba/overlay/modules/chord/messages/Discovery.h	(revision 4617)
+++ /source/ariba/overlay/modules/chord/messages/Discovery.h	(revision 4618)
@@ -108,6 +108,6 @@
 
 private:
-	uint8_t follow_type;
-	uint8_t ttl;
+	uint16_t follow_type; //TODO: was uint8_t
+	uint16_t ttl; //TODO: was uint8_t
 	EndpointDescriptor* source_endpoint;
 //	NodeEndpointList descriptors;
Index: /source/ariba/overlay/modules/onehop/messages/OneHopMessage.h
===================================================================
--- /source/ariba/overlay/modules/onehop/messages/OneHopMessage.h	(revision 4617)
+++ /source/ariba/overlay/modules/onehop/messages/OneHopMessage.h	(revision 4618)
@@ -68,5 +68,5 @@
 
 private:
-	uint8_t type;
+	uint16_t type; // TODO: was uint8_t
 };
 
Index: /source/ariba/utility/types/Identifier.h
===================================================================
--- /source/ariba/utility/types/Identifier.h	(revision 4617)
+++ /source/ariba/utility/types/Identifier.h	(revision 4618)
@@ -569,29 +569,18 @@
 /* serializers */
 sznBeginDefault( ariba::utility::Identifier, X ) {
+
 	// calculate length of key
 	uint16_t len = array_size*sizeof(mp_limb_t);
-	uint8_t unspec = isUnspec;
+	uint16_t unspec = isUnspec; //TODO: was uint8_t
 
 	// only serialize the lower 16 bits of keyLength
 	X && unspec && len;
 
-	/*
-	if (X.isDeserializer()){
-		if(len != array_size*sizeof(mp_limb_t)){
-			std::cout << "len: " << len << ", array_size: "
-				<< array_size << ", sizeof(mp_limb_t): " << sizeof(mp_limb_t) << std::endl;
-			assert(false);
-		}
-	}
-	*/
-
 	// serialize the identifier
 	for (int i=array_size-1; i>=0; i--) X && key[i];
 
-	// when deserializing reset unspec flag
+	// when deserializing set unspec flag
 	if (X.isDeserializer()){
-		//isUnspec = unspec;
-		isUnspec = false;
-		//std::cout << "isUnspec: " << (isUnspec ? "true" : "false") << "   " << "unspec: " << (int)unspec << std::endl;
+		isUnspec = unspec;
 	}
 
Index: /source/ariba/utility/types/OverlayParameterSet.h
===================================================================
--- /source/ariba/utility/types/OverlayParameterSet.h	(revision 4617)
+++ /source/ariba/utility/types/OverlayParameterSet.h	(revision 4618)
@@ -64,5 +64,5 @@
 
 private:
-	uint8_t structure;
+	uint16_t structure; //TODO: was uint8_t
 
 };