Index: trunk/BNC/bnccaster.cpp
===================================================================
--- trunk/BNC/bnccaster.cpp	(revision 134)
+++ trunk/BNC/bnccaster.cpp	(revision 135)
@@ -88,4 +88,5 @@
   // ----------------------------------
   if (newTime <= _lastDumpSec) {
+    emit( newMessage("Old Epochs thrown away: " + staID) );
     delete obs;
     return;
@@ -108,5 +109,5 @@
   // Dump older epochs
   // -----------------
-  const long waitTime = 5;
+  const long waitTime = 2;
   dumpEpochs(_lastDumpSec + 1, newTime - waitTime);
   _lastDumpSec = newTime - waitTime;
Index: trunk/BNC/bncwindow.cpp
===================================================================
--- trunk/BNC/bncwindow.cpp	(revision 134)
+++ trunk/BNC/bncwindow.cpp	(revision 135)
@@ -92,6 +92,11 @@
   _proxyPortLineEdit  = new QLineEdit(settings.value("proxyPort").toString());
   _proxyPortLineEdit->setMaximumWidth(9*ww);
-  _timeOutLineEdit    = new QLineEdit(settings.value("timeOut").toString());
-  _timeOutLineEdit->setMaximumWidth(9*ww);
+  _waitTimeSpinBox   = new QSpinBox();
+  _waitTimeSpinBox->setMinimum(2);
+  _waitTimeSpinBox->setMaximum(30);
+  _waitTimeSpinBox->setSingleStep(1);
+  _waitTimeSpinBox->setSuffix(" sec");
+  _waitTimeSpinBox->setMaximumWidth(9*ww);
+  _waitTimeSpinBox->setValue(settings.value("waitTime").toInt());
   _outFileLineEdit    = new QLineEdit(settings.value("outFile").toString());
   _outPortLineEdit    = new QLineEdit(settings.value("outPort").toString());
@@ -115,4 +120,5 @@
   _rnxSamplSpinBox->setMaximumWidth(9*ww);
   _rnxSamplSpinBox->setValue(settings.value("rnxSampl").toInt());
+  _rnxSamplSpinBox->setSuffix(" sec");
   _mountPointsTable   = new QTableWidget(0,3);
   _mountPointsTable->setMinimumWidth(60*ww);
@@ -167,6 +173,6 @@
   layout->addWidget(new QLabel("Proxy port"),                    0, 2);
   layout->addWidget(_proxyPortLineEdit,                          0, 3);
-  layout->addWidget(new QLabel("timeout (sec)"),                 1, 1);
-  layout->addWidget(_timeOutLineEdit,                            1, 2);
+  layout->addWidget(new QLabel("Wait for full epoch"),           1, 1);
+  layout->addWidget(_waitTimeSpinBox,                            1, 2);
   layout->addWidget(new QLabel("ASCII output file (full path)"), 2, 1);
   layout->addWidget(_outFileLineEdit,                            2, 2, 1, 3);
@@ -180,5 +186,5 @@
   layout->addWidget(_rnxIntrComboBox,                            6, 2);
 
-  layout->addWidget(new QLabel("sampling (sec)"),                6, 3);
+  layout->addWidget(new QLabel("sampling"),                      6, 3);
   layout->addWidget(_rnxSamplSpinBox,                            6, 4);
 
@@ -289,5 +295,5 @@
   settings.setValue("proxyHost",   _proxyHostLineEdit->text());
   settings.setValue("proxyPort",   _proxyPortLineEdit->text());
-  settings.setValue("timeOut",     _timeOutLineEdit->text());
+  settings.setValue("waitTime",    _waitTimeSpinBox->value());
   settings.setValue("outFile",     _outFileLineEdit->text());
   settings.setValue("outPort",     _outPortLineEdit->text());
Index: trunk/BNC/bncwindow.h
===================================================================
--- trunk/BNC/bncwindow.h	(revision 134)
+++ trunk/BNC/bncwindow.h	(revision 135)
@@ -48,5 +48,4 @@
     QLineEdit* _proxyHostLineEdit;
     QLineEdit* _proxyPortLineEdit;
-    QLineEdit* _timeOutLineEdit;
     QLineEdit* _outFileLineEdit;
     QLineEdit* _outPortLineEdit;
@@ -56,4 +55,5 @@
     QComboBox* _rnxIntrComboBox;
     QSpinBox*  _rnxSamplSpinBox;
+    QSpinBox*  _waitTimeSpinBox;
     QTableWidget* _mountPointsTable;