diff --git a/samples/blackmiscdbus/servicetool.cpp b/samples/blackmiscdbus/servicetool.cpp
index ed7f95022..0a884a347 100644
--- a/samples/blackmiscdbus/servicetool.cpp
+++ b/samples/blackmiscdbus/servicetool.cpp
@@ -30,10 +30,6 @@ using namespace BlackMiscTest;
 
 namespace BlackMiscTest
 {
-
-    /*
-     * Start a new process
-     */
     QProcess *ServiceTool::startNewProcess(const QString &executable, const QStringList &arguments, QObject *parent)
     {
         QProcess *process = new QProcess(parent);
@@ -41,9 +37,6 @@ namespace BlackMiscTest
         return process;
     }
 
-    /*
-     * Display DBus arguments
-     */
     void ServiceTool::displayQDBusArgument(const QDBusArgument &arg, qint32 level)
     {
         arg.beginArray();
@@ -68,9 +61,6 @@ namespace BlackMiscTest
         arg.endArray();
     }
 
-    /*
-     * Server side on testserver
-     */
     void ServiceTool::dataTransferTestServer(BlackCore::CDBusServer *dBusServer)
     {
         QDBusConnection sessionBusConnection = QDBusConnection::sessionBus();
@@ -84,9 +74,6 @@ namespace BlackMiscTest
         dBusServer->addObject(Testservice::ServicePath, testservice);
     }
 
-    /*
-     * Client side on testserver
-     */
     void ServiceTool::dataTransferTestClient(const QString &address)
     {
         // send data as P2P to server (this can be session bus, too, but usually is P2P)
@@ -104,9 +91,6 @@ namespace BlackMiscTest
         ServiceTool::sendDataToTestservice(p2pConnection);
     }
 
-    /*
-     * Get callsign
-     */
     CCallsign ServiceTool::getRandomAtcCallsign()
     {
         static QList<CCallsign> callsigns;
@@ -124,9 +108,6 @@ namespace BlackMiscTest
         return cs;
     }
 
-    /*
-     * Stations
-     */
     CAtcStationList ServiceTool::getStations(int number)
     {
         QElapsedTimer timer;
@@ -148,9 +129,6 @@ namespace BlackMiscTest
         return list;
     }
 
-    /*
-     * Aircraft cfg entries
-     */
     CAircraftCfgEntriesList ServiceTool::getAircraftCfgEntries(int number)
     {
         QElapsedTimer timer;
@@ -173,9 +151,6 @@ namespace BlackMiscTest
         return list;
     }
 
-    /*
-     * Airports
-     */
     CAirportList ServiceTool::getAirports(int number)
     {
         BlackMisc::Aviation::CAirportList list;
@@ -209,9 +184,6 @@ namespace BlackMiscTest
         return list;
     }
 
-    /*
-     * Register testservice (server side)
-     */
     Testservice *ServiceTool::registerTestservice(QDBusConnection &connection, QObject *parent)
     {
         Testservice *pTestservice = new Testservice(parent);  // just a QObject with signals / slots and  Q_CLASSINFO("D-Bus Interface", some service name)
@@ -247,9 +219,6 @@ namespace BlackMiscTest
         return pTestservice;
     }
 
-    /*
-     * Send data to testservice, this sends data to the slots on the server
-     */
     void ServiceTool::sendDataToTestservice(const QDBusConnection &connection)
     {
         // on the client's side
diff --git a/src/blackcore/context_runtime_config.h b/src/blackcore/context_runtime_config.h
index 9b0fefd8b..1067e969b 100644
--- a/src/blackcore/context_runtime_config.h
+++ b/src/blackcore/context_runtime_config.h
@@ -1,3 +1,14 @@
+/* Copyright (C) 2013
+ * swift Project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
+//! \file
+
 #ifndef BLACKCORE_CONTEXT_RUNTIME_CONFIG_H
 #define BLACKCORE_CONTEXT_RUNTIME_CONFIG_H
 
diff --git a/src/blackgui/models/actionmodel.cpp b/src/blackgui/models/actionmodel.cpp
index eb42cac48..3e032fcd9 100644
--- a/src/blackgui/models/actionmodel.cpp
+++ b/src/blackgui/models/actionmodel.cpp
@@ -1,3 +1,12 @@
+/* Copyright (C) 2015
+ * swift project Community / Contributors
+ *
+ * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
+ * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
+ * including this file, may be copied, modified, propagated, or distributed except according to the terms
+ * contained in the LICENSE file.
+ */
+
 #include "actionmodel.h"
 #include "actionitem.h"
 #include "blackcore/input_manager.h"
@@ -14,8 +23,7 @@ namespace BlackGui
         }
 
         CActionModel::~CActionModel()
-        {
-        }
+        { }
 
         int CActionModel::columnCount(const QModelIndex &parent) const
         {
diff --git a/src/blackmisc/blackmiscfreefunctions_nwmeta.cpp b/src/blackmisc/blackmiscfreefunctions_nwmeta.cpp
index f8e148025..2b9e9d013 100644
--- a/src/blackmisc/blackmiscfreefunctions_nwmeta.cpp
+++ b/src/blackmisc/blackmiscfreefunctions_nwmeta.cpp
@@ -19,17 +19,19 @@
  */
 void BlackMisc::Network::registerMetadata()
 {
-    CUser::registerMetadata();
-    CUserList::registerMetadata();
     CAuthenticatedUser::registerMetadata();
+    CClient::registerMetadata();
+    CClientList::registerMetadata();
+    CEntityFlags::registerMetadata();
     CRole::registerMetadata();
     CRoleList::registerMetadata();
     CServer::registerMetadata();
     CServerList::registerMetadata();
     CTextMessage::registerMetadata();
     CTextMessageList::registerMetadata();
-    CClient::registerMetadata();
-    CClientList::registerMetadata();
+    CUrl::registerMetadata();
+    CUrlList::registerMetadata();
+    CUser::registerMetadata();
+    CUserList::registerMetadata();
     CVoiceCapabilities::registerMetadata();
-    CEntityFlags::registerMetadata();
 }
diff --git a/src/blackmisc/network/network.h b/src/blackmisc/network/network.h
index 8cb129375..04f2685e5 100644
--- a/src/blackmisc/network/network.h
+++ b/src/blackmisc/network/network.h
@@ -17,15 +17,19 @@
  * \brief Classes related to the traffic network, swift DB, such as VATSIM user, utilities, URL etc.
  */
 
-#include "blackmisc/network/user.h"
-#include "blackmisc/network/userlist.h"
 #include "blackmisc/network/authenticateduser.h"
-#include "blackmisc/network/role.h"
-#include "blackmisc/network/rolelist.h"
-#include "blackmisc/network/serverlist.h"
-#include "blackmisc/network/textmessagelist.h"
 #include "blackmisc/network/client.h"
 #include "blackmisc/network/clientlist.h"
+#include "blackmisc/network/role.h"
+#include "blackmisc/network/rolelist.h"
+#include "blackmisc/network/server.h"
+#include "blackmisc/network/serverlist.h"
+#include "blackmisc/network/textmessage.h"
+#include "blackmisc/network/textmessagelist.h"
+#include "blackmisc/network/url.h"
+#include "blackmisc/network/urllist.h"
+#include "blackmisc/network/user.h"
+#include "blackmisc/network/userlist.h"
 #include "blackmisc/network/voicecapabilities.h"
 
 #endif // guard