diff --git a/src/devices/mesh/dot11s/peer-link.cc b/src/devices/mesh/dot11s/peer-link.cc
index 0d38699c8..f5171a6ae 100644
--- a/src/devices/mesh/dot11s/peer-link.cc
+++ b/src/devices/mesh/dot11s/peer-link.cc
@@ -60,7 +60,7 @@ PeerLink::GetTypeId()
                       .AddAttribute ("MaxBeaconLoss", "Maximum number of lost beacons before link will be closed",
                                      UintegerValue (3),
                                      MakeUintegerAccessor (&PeerLink::m_maxBeaconLoss),
-                                     MakeUintegerChecker<uint16_t> ()
+                                     MakeUintegerChecker<uint16_t> (1)
                                     );
   return tid;
 }
diff --git a/src/devices/mesh/dot11s/peer-manager-plugin.cc b/src/devices/mesh/dot11s/peer-manager-plugin.cc
index ebabcdf06..0948ace3d 100644
--- a/src/devices/mesh/dot11s/peer-manager-plugin.cc
+++ b/src/devices/mesh/dot11s/peer-manager-plugin.cc
@@ -51,7 +51,7 @@ PeerManagerMacPlugin::SetParent (Ptr<MeshWifiInterfaceMac> parent)
 bool
 PeerManagerMacPlugin::Receive (Ptr<Packet> const_packet, const WifiMacHeader & header)
 {
-  /// First of all we copy a packet, because we need to remove some
+  // First of all we copy a packet, because we need to remove some
   //headers
   Ptr<Packet> packet = const_packet->Copy();
   if(header.IsBeacon())
@@ -71,7 +71,7 @@ PeerManagerMacPlugin::Receive (Ptr<Packet> const_packet, const WifiMacHeader & h
         Simulator::Now(),
         MicroSeconds(beacon_hdr.GetBeaconIntervalUs())
         );
-    /// Beacon shall not be dropeed. May be needed to another plugins
+    // Beacon shall not be dropeed. May be needed to another plugins
     return true;
   }
   if(header.IsMultihopAction())
@@ -82,7 +82,7 @@ PeerManagerMacPlugin::Receive (Ptr<Packet> const_packet, const WifiMacHeader & h
     //parse multihop action header:
     packet->RemoveHeader (multihopHdr);
     WifiMeshMultihopActionHeader::ACTION_VALUE actionValue = multihopHdr.GetAction ();
-    /// If can not handle - just return;
+    // If can not handle - just return;
     if(multihopHdr.GetCategory () != WifiMeshMultihopActionHeader::MESH_PEER_LINK_MGT)
       return true;
     Mac48Address peerAddress = header.GetAddr2 ();
@@ -97,25 +97,25 @@ PeerManagerMacPlugin::Receive (Ptr<Packet> const_packet, const WifiMacHeader & h
       if(!(m_parent->CheckSupportedRates(fields.rates)))
       {
         m_protocol->ConfigurationMismatch (m_ifIndex, peerAddress);
-        /// Broken peer link frame - drop it
+        // Broken peer link frame - drop it
         return false;
       }
       if (!fields.meshId.IsEqual(m_parent->GetSsid()))
       {
         m_protocol->ConfigurationMismatch (m_ifIndex, peerAddress);
-        /// Broken peer link frame - drop it
+        // Broken peer link frame - drop it
         return true;
       }
     }
-    /// MeshConfiguration Element - exists in all peer link management
-    /// frames except CLOSE
+    // MeshConfiguration Element - exists in all peer link management
+    // frames except CLOSE
     IeConfiguration meshConfig;
     if(fields.subtype != IePeerManagement::PEER_CLOSE)
     packet->RemoveHeader(meshConfig);
     IePeerManagement peerElement;
     packet->RemoveHeader(peerElement);
-    /// Check the correspondance betwee action valuse and peer link
-    /// management element subtypes:
+    // Check the correspondance betwee action valuse and peer link
+    // management element subtypes:
     switch (actionValue.peerLink)
     {
       case WifiMeshMultihopActionHeader::PEER_LINK_CONFIRM:
@@ -128,12 +128,12 @@ PeerManagerMacPlugin::Receive (Ptr<Packet> const_packet, const WifiMacHeader & h
         NS_ASSERT(fields.subtype == IePeerManagement::PEER_CLOSE);
         break;
       default:
-        /// Protocol can not define which frame is it - pass further
+        // Protocol can not define which frame is it - pass further
         return true;
     }
     //Deliver Peer link management frame to protocol:
     m_protocol->ReceivePeerLinkFrame(m_ifIndex, peerAddress, fields.aid, peerElement, meshConfig);
-    /// if we can handle a frame - drop it
+    // if we can handle a frame - drop it
     return false;
   } 
   return true;
@@ -151,6 +151,7 @@ PeerManagerMacPlugin::UpdateBeacon (MeshWifiBeacon & beacon) const
   Ptr<IeBeaconTiming>  beaconTiming = m_protocol->GetBeaconTimingElement(m_ifIndex);
   beacon.AddInformationElement(beaconTiming);
 }
+
 void
 PeerManagerMacPlugin::SendPeerLinkManagementFrame(
       Mac48Address peerAddress,
@@ -209,6 +210,7 @@ PeerManagerMacPlugin::SendPeerLinkManagementFrame(
   hdr.SetDsNotTo ();
   m_parent->SendManagementFrame(packet, hdr);
 }
+
 Mac48Address
 PeerManagerMacPlugin::GetAddress () const
 {
diff --git a/src/devices/mesh/dot11s/peer-manager-protocol.cc b/src/devices/mesh/dot11s/peer-manager-protocol.cc
index 7158d73e5..08ca1f776 100644
--- a/src/devices/mesh/dot11s/peer-manager-protocol.cc
+++ b/src/devices/mesh/dot11s/peer-manager-protocol.cc
@@ -47,18 +47,18 @@ PeerManagerProtocol::GetTypeId (void)
   static TypeId tid = TypeId ("ns3::PeerManagerProtocol")
     .SetParent<Object> ()
     .AddConstructor<PeerManagerProtocol> ()
-    /// peerLinkCleanupTimeout. We go through the map of peer links and 
-    /// remove all links which state is IDLE.
+    // peerLinkCleanupTimeout. We go through the map of peer links and 
+    // remove all links which state is IDLE.
     .AddAttribute ("PeerLinkCleanupPeriod",
-        "PeerLinkCleanupPeriod",
+        "Idle peer link collection interval",
         TimeValue (MilliSeconds (80)),
         MakeTimeAccessor (&PeerManagerProtocol::m_peerLinkCleanupPeriod),
         MakeTimeChecker ()
         )
-    /// maximum number of peer links. Now we calculate the total
-    /// number of peer links on all interfaces
+    // maximum number of peer links. Now we calculate the total
+    // number of peer links on all interfaces
     .AddAttribute ("MaxNumberOfPeerLinks",
-        "Maximum number of peer links ",
+        "Maximum number of peer links",
         UintegerValue (32),
         MakeUintegerAccessor (&PeerManagerProtocol::m_maxNumberOfPeerLinks),
         MakeUintegerChecker<uint8_t> ()
@@ -144,6 +144,7 @@ PeerManagerProtocol::GetBeaconTimingElement(uint32_t interface)
     retval->AddNeighboursTimingElementUnit(j->second.aid, j->second.referenceTbtt, j->second.beaconInterval);
   return retval;
 }
+
 void
 PeerManagerProtocol::FillBeaconInfo(uint32_t interface, Mac48Address peerAddress, Time receivingTime, Time beaconInterval)
 {
@@ -267,7 +268,7 @@ PeerManagerProtocol::InitiateLink (
     FillBeaconInfo(interface, peerAddress, lastBeacon, beaconInterval);
   //find a peer link  - it must not exist
   NS_ASSERT(FindPeerLink(interface, peerAddress) == 0);
-  /// Plugin must exust
+  // Plugin must exist
   PeerManagerPluginMap::iterator plugin = m_plugins.find (interface);
   NS_ASSERT(plugin != m_plugins.end ());
   PeerLinksMap::iterator iface = m_peerLinks.find (interface);
@@ -316,7 +317,6 @@ PeerManagerProtocol::PeerCleanup ()
       to_erase.clear ();
     }
   // cleanup neighbour beacons:
-  //NS_ASSERT(false);
   m_cleanupEvent = Simulator::Schedule (m_peerLinkCleanupPeriod, &PeerManagerProtocol::PeerCleanup, this);
 }
 bool
diff --git a/src/devices/mesh/dot11s/peer-manager-protocol.h b/src/devices/mesh/dot11s/peer-manager-protocol.h
index 1c28e2484..1fdf17e26 100644
--- a/src/devices/mesh/dot11s/peer-manager-protocol.h
+++ b/src/devices/mesh/dot11s/peer-manager-protocol.h
@@ -38,6 +38,8 @@ class PeerManagerMacPlugin;
 class PeerLink;
 /**
  * \ingroup dot11s
+ * 
+ * \brief 802.11s Peer Management Protocol model 
  */
 class PeerManagerProtocol : public Object
 {