diff --git a/Examples/Sniffer/Doxyfile b/Examples/Sniffer/Doxyfile
index 1c41e35036d2b1df44485a6c042ef3b0ecdd3a4f..da7fce1653116153d728c729cecb7b0fbb7ade6b 100644
--- a/Examples/Sniffer/Doxyfile
+++ b/Examples/Sniffer/Doxyfile
@@ -7,4 +7,6 @@ TAGFILES = \
 	"$(TOPDIR)/Scheduler/doc/Scheduler.tag" \
 	"$(TOPDIR)/Packets/doc/Packets.tag" \
 	"$(TOPDIR)/Socket/doc/Socket.tag" \
-	"$(TOPDIR)/Utils/doc/Utils.tag"
+	"$(TOPDIR)/Utils/doc/Utils.tag" \
+    "$(TOPDIR)/doc/overview.tag"
+	
\ No newline at end of file
diff --git a/Examples/Sniffer/Mainpage.dox b/Examples/Sniffer/Mainpage.dox
index ebd3c210f225d1b4968c0b03d2df0109bc890bec..7d443a4ad9a67a1e370fe32472467dc9b43f8913 100644
--- a/Examples/Sniffer/Mainpage.dox
+++ b/Examples/Sniffer/Mainpage.dox
@@ -175,8 +175,8 @@
     This function is straight forward. The exception handling is the same as in \c loop_main(). The
     code then just creates a \c Sniffer instance and calls it's \c run() member.
 
-    \see \ref components \n
-         \ref build \n
+    \see \ref senf_components \n
+         \ref senf_build \n
          <a href="../../../../Socket/doc/html/index.html"><b>libSocket API reference</b></a> \n
          <a href="../../../../Packets/doc/html/index.html"><b>libPackets API reference</b></a> \n
          <a href="../../../../Utils/doc/html/index.html"><b>libUtils API reference</b></a>
diff --git a/Socket/Protocols/INet/UDPSocketHandle.hh b/Socket/Protocols/INet/UDPSocketHandle.hh
index 3a85354522070c1de00999d53d80da972a064074..d114c3d6a997e1f32372defa7d5037df82e96019 100644
--- a/Socket/Protocols/INet/UDPSocketHandle.hh
+++ b/Socket/Protocols/INet/UDPSocketHandle.hh
@@ -101,7 +101,7 @@ namespace senf {
                                         ///< Create client socket and bind
                                         /**< Creates a new client socket and bind to the given
                                              address.
-                                             \param[in] local address to bind to */
+                                             \param[in] address local address to bind to */
                                         /**< \note This member is implicitly called from the
                                             ProtocolClientSocketHandle::ProtocolClientSocketHandle()
                                              constructor */
@@ -165,7 +165,7 @@ namespace senf {
                                         ///< Create client socket and connect
                                         /**< Creates a new client socket and bind to the given
                                              address.
-                                             \param[in] local address to bind to */
+                                             \param[in] address local address to bind to */
                                         /**< \note This member is implicitly called from the
                                              ProtocolClientSocketHandle::ProtocolClientSocketHandle()
                                              constructor */
diff --git a/Socket/Protocols/UN/UNDatagramSocketHandle.hh b/Socket/Protocols/UN/UNDatagramSocketHandle.hh
index 20c9977dc5dce1e603aa478e5903b035f9d38d91..a8d709420550f728902a3c187f190784624bbe90 100644
--- a/Socket/Protocols/UN/UNDatagramSocketHandle.hh
+++ b/Socket/Protocols/UN/UNDatagramSocketHandle.hh
@@ -34,8 +34,6 @@
 #include "../../../Socket/BufferingPolicy.hh"
 #include "../../../Socket/ProtocolClientSocketHandle.hh"
 
-
-
 //#include "UNDatagramSocketHandle.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
@@ -56,7 +54,7 @@ namespace senf {
     /** \brief Unix Domain Datagram Socket Protocol
 
         \par Socket Handle typedefs:
-            \ref UNDatagramSocketHandle (ProtocolClientSocketHandle)
+            \ref UNDatagramClientSocketHandle (ProtocolClientSocketHandle)
 
         \par Policy Interface: (to be checked)
             ClientSocketHandle::read(), ClientSocketHandle::readfrom(),
@@ -93,7 +91,7 @@ namespace senf {
                                         ///< Create client socket and bind
                                         /**< Creates a new client socket and bind to the given
                                              address.
-                                             \param[in] local address to bind to */
+                                             \param[in] address local address to bind to */
                                         /**< \note This member is implicitly called from the
                                              ProtocolClientSocketHandle::ProtocolClientSocketHandle()
                                              constructor */
diff --git a/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc b/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc
index 6eb446021c8554be7d5c448a7c6ef19518f4aae5..b39fd0ad43cece7629755e07f310d805c3860339 100644
--- a/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc
+++ b/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc
@@ -35,23 +35,24 @@
 
 BOOST_AUTO_UNIT_TEST(unDatagramSocketHandle)
 {
-  std::string hallo = "Hallo Welt.";
-  std::string testS = ".socket-UNDatagramSocketHandle.test";
-  
-  unlink(testS.c_str()); 
+    std::string testString ("Hallo Welt.");
+    std::string socketPath (".socket-UNDatagramSocketHandle.test");
 
-  senf::UNSocketAddress addr (testS) ; 
-  senf::UNDatagramClientSocketHandle inputSocket(addr);
-  senf::UNDatagramClientSocketHandle outputSocket;
+    unlink(socketPath.c_str());
 
-  outputSocket.writeto( addr, hallo);
+    senf::UNSocketAddress addr (socketPath);
+    senf::UNDatagramClientSocketHandle inputSocket(addr);
+    senf::UNDatagramClientSocketHandle outputSocket;
 
-  BOOST_CHECK_EQUAL( inputSocket.read(), hallo);
-  outputSocket.close();
-  inputSocket.close();
-  
-  if( unlink(testS.c_str()) != 0) 
-       perror( "unlink failed");
+    outputSocket.writeto( addr, testString);
+
+    BOOST_CHECK_EQUAL( inputSocket.read(), testString);
+
+    outputSocket.close();
+    inputSocket.close();
+
+    if( unlink(socketPath.c_str()) != 0)
+        perror( "unlink failed");
 }