diff --git a/samples/blackgui/mainwindow.ui b/samples/blackgui/mainwindow.ui
index 464694af9..053aa5f81 100644
--- a/samples/blackgui/mainwindow.ui
+++ b/samples/blackgui/mainwindow.ui
@@ -1538,7 +1538,7 @@ QSizeGrip {
            <item>
             <widget class="QTabWidget" name="tb_Settings">
              <property name="currentIndex">
-              <number>1</number>
+              <number>0</number>
              </property>
              <widget class="QWidget" name="tb_SettingsTrafficNetwork">
               <attribute name="title">
diff --git a/samples/blackgui/mainwindow_init.cpp b/samples/blackgui/mainwindow_init.cpp
index 015de7ac8..c906fe1d8 100644
--- a/samples/blackgui/mainwindow_init.cpp
+++ b/samples/blackgui/mainwindow_init.cpp
@@ -208,8 +208,7 @@ void MainWindow::initGuiSignals()
     this->connect(this->ui->le_CommandLineInput, &QLineEdit::returnPressed, this, &MainWindow::commandEntered);
 
     // cockpit
-    connected = this->connect(this->ui->cb_CockpitTransponderMode, SIGNAL(currentIndexChanged(QString)),
-                              this, SLOT(cockpitValuesChanged()));
+    connected = this->connect(this->ui->cb_CockpitTransponderMode, SIGNAL(currentIndexChanged(QString)), this, SLOT(cockpitValuesChanged()));
     Q_ASSERT(connected);
     this->connect(this->ui->ds_CockpitCom1Active, &QDoubleSpinBox::editingFinished, this, &MainWindow::cockpitValuesChanged);
     this->connect(this->ui->ds_CockpitCom2Active, &QDoubleSpinBox::editingFinished, this, &MainWindow::cockpitValuesChanged);
diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h
index 5846d6b84..ac6347672 100644
--- a/src/blackcore/context_network.h
+++ b/src/blackcore/context_network.h
@@ -251,8 +251,6 @@ namespace BlackCore
 
         /*!
          * \brief ATIS received
-         * \param callsign
-         * \param atisMessage
          */
         void psFsdAtisQueryReceived(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CInformationMessage &atisMessage);
 
diff --git a/src/blackcore/context_network_atc.cpp b/src/blackcore/context_network_atc.cpp
index 970dd3d20..56509db36 100644
--- a/src/blackcore/context_network_atc.cpp
+++ b/src/blackcore/context_network_atc.cpp
@@ -155,7 +155,7 @@ namespace BlackCore
     {
         // this->log(Q_FUNC_INFO, callsign.toQString(), atisMessage);
 
-        CValueMap vm(CAtcStation::IndexAtisMessage, atisMessage.toQVariant());
+        CValueMap vm(CAtcStation::IndexAtis, atisMessage.toQVariant());
         this->m_atcStationsOnline.applyIf(&CAtcStation::getCallsign, callsign, vm);
         this->m_atcStationsBooked.applyIf(&CAtcStation::getCallsign, callsign, vm);
     }
diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/network_vatlib.cpp
index 9f9940934..39c556d06 100644
--- a/src/blackcore/network_vatlib.cpp
+++ b/src/blackcore/network_vatlib.cpp
@@ -26,7 +26,7 @@ namespace BlackCore
     using namespace BlackMisc::Aviation;
     using namespace BlackMisc::Network;
 
-    void exceptionDispatcher(const char* caller);
+    void exceptionDispatcher(const char *caller);
 
     CNetworkVatlib::CNetworkVatlib(CNetworkVatlib::LoginMode loginMode, QObject *parent)
         : INetwork(parent),
@@ -310,7 +310,7 @@ namespace BlackCore
     }
 
     void CNetworkVatlib::setOwnAircraftAvionics(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2,
-        const BlackMisc::Aviation::CTransponder &xpdr)
+            const BlackMisc::Aviation::CTransponder &xpdr)
     {
         m_ownAircraft.setCom1System(com1);
         m_ownAircraft.setCom1System(com2);
@@ -411,7 +411,7 @@ namespace BlackCore
         try
         {
             m_net->ReplyToInfoQuery(Cvatlib_Network::infoQuery_Freq, toFSD(callsign),
-                toFSD(QString::number(m_ownAircraft.getCom1System().getFrequencyActive().value(CFrequencyUnit::MHz()), 'f', 3)));
+                                    toFSD(QString::number(m_ownAircraft.getCom1System().getFrequencyActive().value(CFrequencyUnit::MHz()), 'f', 3)));
         }
         catch (...) { exceptionDispatcher(Q_FUNC_INFO); }
     }
@@ -658,7 +658,7 @@ namespace BlackCore
 
     void CNetworkVatlib::onAtisReplyReceived(Cvatlib_Network *, const char *callsign, Cvatlib_Network::atisLineType lineType, const char *data, void *cbvar)
     {
-        auto &atis = cbvar_cast(cbvar)->m_atisParts[cbvar_cast(cbvar)->fromFSD(callsign)];
+        auto &atis = cbvar_cast(cbvar)->m_atisParts[cbvar_cast(cbvar)->fromFSD(callsign)]; // also inserts in map if not already in
 
         if (lineType == Cvatlib_Network::atisLineType_VoiceRoom)
         {
@@ -687,7 +687,9 @@ namespace BlackCore
                 if (test.startsWith("z") && test.length() == 2) return; // z1, z2, ..
                 if (test.length() == 1) return; // sometimes just z
 
-                atis.appendMessage("\n" + cbvar_cast(cbvar)->fromFSD(data));
+                // append
+                if (!atis.isEmpty()) atis.appendMessage("\n");
+                atis.appendMessage(fixed);
             }
         }
     }