Index: /trunk/BNC/src/bncwindow.cpp
===================================================================
--- /trunk/BNC/src/bncwindow.cpp	(revision 10152)
+++ /trunk/BNC/src/bncwindow.cpp	(revision 10153)
@@ -495,5 +495,5 @@
   _cmbSamplSpinBox->setMinimum(0);
   _cmbSamplSpinBox->setMaximum(60);
-  _cmbSamplSpinBox->setSingleStep(10);
+  _cmbSamplSpinBox->setSingleStep(5);
   _cmbSamplSpinBox->setMaximumWidth(9*ww);
   _cmbSamplSpinBox->setValue(settings.value("cmbSampl").toInt());
Index: /trunk/BNC/src/combination/bnccomb.cpp
===================================================================
--- /trunk/BNC/src/combination/bnccomb.cpp	(revision 10152)
+++ /trunk/BNC/src/combination/bnccomb.cpp	(revision 10153)
@@ -486,5 +486,5 @@
     // ----------------------------
     if ((newClk->_time >= currentTime) ||        // future time stamp
-        (currentTime - newClk->_time) > 120.0) { // very old data sets
+        (currentTime - newClk->_time) > 60.0) { // very old data sets
 #ifdef BNC_DEBUG_CMB
       emit newMessage("bncComb: very old data sets: " + acName.toLatin1() + " " + newClk->_prn.toString().c_str() +
@@ -494,11 +494,4 @@
       delete newClk;
       continue;
-    }
-
-
-    // Set the last time
-    // -----------------
-    if (_lastClkCorrTime.undef() || newClk->_time > _lastClkCorrTime) {
-      _lastClkCorrTime = newClk->_time;
     }
 
@@ -515,4 +508,10 @@
     }
 
+    // Set the last time
+    // -----------------
+    if (_lastClkCorrTime.undef() || newClk->_time > _lastClkCorrTime) {
+      _lastClkCorrTime = newClk->_time;
+    }
+
     // Find the corresponding data epoch or create a new one
     // -----------------------------------------------------
@@ -545,5 +544,5 @@
   // Make sure the buffer does not grow beyond any limit
   // ---------------------------------------------------
-  const unsigned MAX_EPODATA_SIZE = 25;
+  const unsigned MAX_EPODATA_SIZE = 12;
   if (_epoClkData.size() > MAX_EPODATA_SIZE) {
     delete _epoClkData.front();
@@ -563,5 +562,5 @@
     bncTime epoTime = _epoClkData.front()->_time;
 
-    if ((currentTime - epoTime) > 120.0) {
+    if ((currentTime - epoTime) > 60.0) {
       delete _epoClkData.front();
       _epoClkData.pop_front();
@@ -1067,5 +1066,5 @@
     // -------------------------------
 
-    ColumnVector dx(3); dx = 0.0;
+    ColumnVector dx(3);   dx = 0.0;
     ColumnVector apc(3); apc = 0.0;
     ColumnVector com(3); com = 0.0;
@@ -1392,5 +1391,13 @@
 t_irc bncComb::checkOrbits(bncTime epoTime, char sys, QTextStream& out) {
 
-  const double MAX_DISPLACEMENT = 0.20;
+  const double MAX_DISPLACEMENT_INIT = 0.50;
+
+  double MAX_DISPLACEMENT = MAX_DISPLACEMENT_INIT;
+  if (sys == 'C') {
+    MAX_DISPLACEMENT *= 10.0;
+  }
+  if (sys == 'R') {
+    MAX_DISPLACEMENT *= 2.0;
+  }
 
   // Switch to last ephemeris (if possible)