diff --git a/src/blackcore/application.cpp b/src/blackcore/application.cpp
index 286474a68..38b31d3b9 100644
--- a/src/blackcore/application.cpp
+++ b/src/blackcore/application.cpp
@@ -826,23 +826,23 @@ namespace BlackCore
 
         // dev. system
         m_cmdDevelopment = QCommandLineOption({ "dev", "development" },
-                                 QCoreApplication::translate("application", "Dev. system features?"));
+                                              QCoreApplication::translate("application", "Dev. system features?"));
         this->addParserOption(m_cmdDevelopment);
 
         // can read a local bootstrap file
         m_cmdSharedDir = QCommandLineOption({ "shared", "shareddir" },
-                               QCoreApplication::translate("application", "Local shared directory."),
-                               "shared");
+                                            QCoreApplication::translate("application", "Local shared directory."),
+                                            "shared");
         this->addParserOption(m_cmdSharedDir);
 
         // reset caches upfront
         m_cmdClearCache = QCommandLineOption({ "ccache", "clearcache" },
-                                QCoreApplication::translate("application", "Clear (reset) the caches."));
+                                             QCoreApplication::translate("application", "Clear (reset) the caches."));
         this->addParserOption(m_cmdClearCache);
 
         // test crashpad upload
         m_cmdTestCrashpad = QCommandLineOption({ "testcp", "testcrashpad" },
-                                  QCoreApplication::translate("application", "Simulate crashpad situation."));
+                                               QCoreApplication::translate("application", "Simulate crashpad situation."));
         this->addParserOption(m_cmdTestCrashpad);
     }
 
@@ -1007,8 +1007,8 @@ namespace BlackCore
     void CApplication::addDBusAddressOption()
     {
         m_cmdDBusAddress = QCommandLineOption({ "dbus", "dbusaddress" },
-                                 QCoreApplication::translate("application", "DBus address (session, system, P2P IP e.g. 192.168.23.5)"),
-                                 "dbusaddress");
+                                              QCoreApplication::translate("application", "DBus address (session, system, P2P IP e.g. 192.168.23.5)"),
+                                              "dbusaddress");
         this->addParserOption(m_cmdDBusAddress);
     }
 
diff --git a/src/blackcore/application.h b/src/blackcore/application.h
index 9edbaa4fd..21b466158 100644
--- a/src/blackcore/application.h
+++ b/src/blackcore/application.h
@@ -252,9 +252,9 @@ namespace BlackCore
         //! \return all cache files
         static QStringList clearCaches();
 
-        // ----------------------- parsing ----------------------------------------
+        // ----------------------- cmd line args / parsing ----------------------------------------
 
-        //! \name parsing of command line options
+        //! \name cmd line args and parsing of command line options
         //! @{
 
         //! \copydoc QCommandLineParser::addOption
@@ -318,10 +318,12 @@ namespace BlackCore
 
         //! Init the contexts part and start core facade
         //! \sa coreFacadeStarted
+        //! \remark requires setup loaded
         BlackMisc::CStatusMessageList useContexts(const CCoreFacadeConfig &coreConfig);
 
         //! Init web data services and start them
         //! \sa webDataServicesStarted
+        //! \remark requires setup loaded
         BlackMisc::CStatusMessageList useWebDataServices(const CWebReaderFlags::WebReader webReader, const BlackCore::Db::CDatabaseReaderConfigList &dbReaderConfig);
 
         //! Get the facade
diff --git a/src/blackcore/db/backgrounddataupdater.h b/src/blackcore/db/backgrounddataupdater.h
index df749c959..d0a1f0a0f 100644
--- a/src/blackcore/db/backgrounddataupdater.h
+++ b/src/blackcore/db/backgrounddataupdater.h
@@ -43,7 +43,7 @@ namespace BlackCore
             BlackMisc::Simulation::Data::CModelSetCaches m_modelSetCaches { false, this }; //!< caches
             QMap<QString, QDateTime> m_dbModelsLatestChange;
 
-            //! Do the udpate checks
+            //! Do the update checks
             void doWork();
 
             //! Read of new DB data
diff --git a/src/blackcore/db/icaodatareader.cpp b/src/blackcore/db/icaodatareader.cpp
index 7c56f0801..e3e39dd28 100644
--- a/src/blackcore/db/icaodatareader.cpp
+++ b/src/blackcore/db/icaodatareader.cpp
@@ -230,7 +230,7 @@ namespace BlackCore
             QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
             if (!this->doWorkCheck()) { return; }
 
-            CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data());
+            const CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data());
             if (res.hasErrorMessage())
             {
                 CLogMessage::preformatted(res.lastWarningOrAbove());
@@ -280,7 +280,7 @@ namespace BlackCore
             QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
             if (!this->doWorkCheck()) { return; }
 
-            CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data());
+            const CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data());
             if (res.hasErrorMessage())
             {
                 CLogMessage::preformatted(res.lastWarningOrAbove());
@@ -328,7 +328,7 @@ namespace BlackCore
         void CIcaoDataReader::ps_parseCountryData(QNetworkReply *nwReplyPtr)
         {
             QScopedPointer<QNetworkReply, QScopedPointerDeleteLater> nwReply(nwReplyPtr);
-            CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data());
+            const CDatabaseReader::JsonDatastoreResponse res = this->setStatusAndTransformReplyIntoDatastoreResponse(nwReply.data());
             if (res.hasErrorMessage())
             {
                 CLogMessage::preformatted(res.lastWarningOrAbove());
diff --git a/src/blackgui/components/dbloadoverviewcomponent.cpp b/src/blackgui/components/dbloadoverviewcomponent.cpp
index c49f8f2ea..f304bbfda 100644
--- a/src/blackgui/components/dbloadoverviewcomponent.cpp
+++ b/src/blackgui/components/dbloadoverviewcomponent.cpp
@@ -31,7 +31,7 @@ namespace BlackGui
             Q_ASSERT_X(sGui, Q_FUNC_INFO, "missing sGui");
             ui->setupUi(this);
 
-            //! \fixme KB 201709 It is hard to judgte if it is a good idea to trigger cache admit in a UI component
+            //! \fixme KB 201709 It is hard to judge if it is a good idea to trigger cache admit in a UI component
             //  althought admit happens in background, this component might trigger cache reads not needed (though it is not very likely)
             this->admitCaches();
 
@@ -272,6 +272,7 @@ namespace BlackGui
 
         void CDbLoadOverviewComponent::admitCaches()
         {
+            // remark admit only triggers, it does not wait like synchronize
             if (!sGui->hasWebDataServices()) { return; }
             sGui->getWebDataServices()->admitDbCaches(CEntityFlags::AllDbEntities);
         }
diff --git a/src/blackmisc/network/entityflags.cpp b/src/blackmisc/network/entityflags.cpp
index 796a9be90..5a7e11490 100644
--- a/src/blackmisc/network/entityflags.cpp
+++ b/src/blackmisc/network/entityflags.cpp
@@ -60,7 +60,7 @@ namespace BlackMisc
             if (flag.testFlag(NoEntity)) list << "no data";
             if (flag.testFlag(VatsimDataFile)) list << "VATSIM data file";
             if (flag.testFlag(VatsimStatusFile)) list << "VATSIM status file";
-            return list.join(',');
+            return list.join(", ");
         }
 
         bool CEntityFlags::isSingleEntity(BlackMisc::Network::CEntityFlags::Entity flag)