diff --git a/src/pEpTransportUDP.c b/src/pEpTransportUDP.c
index a1a2be8..a1c35d4 100644
--- a/src/pEpTransportUDP.c
+++ b/src/pEpTransportUDP.c
@@ -1,6 +1,6 @@
 #include "pEpTransportUDP.h"
 
-#define SERVERPORT "4950" // the port we will use
+#define SERVERPORT "4950" // the default port we will use
 #define MAXBUFLEN 1501
 
 static int socki_s, socki_r; // Socket handlers
diff --git a/src/pEpTransportUDP.h b/src/pEpTransportUDP.h
index 845d4e0..6301871 100644
--- a/src/pEpTransportUDP.h
+++ b/src/pEpTransportUDP.h
@@ -41,20 +41,17 @@ bool longmsg_supported();
 bool longmsg_formatted_supported();
 PEP_text_format native_text_format();
 
-//PEP_transport_id id;
+PEP_transport_id id;
 
 // The registered callback functions
-//CBStatusChange cb_statuschange;
-//CBSendToResult cb_sendto_result;
-//CBIncomminMessage cb_incomming_message;
+signal_status_change_t cb_statuschange;
+signal_sendto_result_t cb_sendto_result;
+signal_incoming_message_t cb_incomming_message;
 
-//bool cb_statuschange_registered;
-//bool cb_sendto_result_registered;
-//bool cb_incomming_message_registered;
+bool cb_statuschange_registered;
+bool cb_sendto_result_registered;
+bool cb_incomming_message_registered;
 
 bool allCallbacksRegistered();
-void throwInvalidState();
-
-//int socki;
 
 #endif // PEPUDPTRANSPORT_HH