Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp
===================================================================
--- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp	(revision 10995)
+++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm.cpp	(revision 10996)
@@ -55,5 +55,6 @@
   for (s = 0; s < CLOCKORBIT_SATNUM; ++s) {
     for (i = 0; i < COBOFS_NUM; ++i) {
-      if (co->NumberOfSat[s] && (type == COTYPE_AUTO || type == corbase[s] + i) &&
+      if (co->NumberOfSat[s] && 
+        (type == COTYPE_AUTO || type == corbase[s] + i) &&
            (co->Supplied[i] || (i <= COBOFS_CLOCK &&  co->Supplied[COBOFS_COMBINED]) ||
            (i == COBOFS_COMBINED && co->Supplied[COBOFS_ORBIT] && co->Supplied[COBOFS_CLOCK]))) {
Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp
===================================================================
--- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp	(revision 10995)
+++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp	(revision 10996)
@@ -54,6 +54,6 @@
   for (s = 0; s < CLOCKORBIT_SATNUM; ++s) {
     for (i = 0; i < COBOFS_NUM; ++i) {
-      if (co->NumberOfSat[s] && (type == COTYPE_AUTO || type == corbase[s] + i) &&
-           (co->Supplied[i] || (i <= COBOFS_CLOCK &&  co->Supplied[COBOFS_COMBINED]) ||
+      if (co->NumberOfSat[s] && (type == COTYPE_AUTO || type == corbase[s] + i) && (co->Supplied[i] || 
+        (i <= COBOFS_CLOCK &&  co->Supplied[COBOFS_COMBINED]) ||
            (i == COBOFS_COMBINED && co->Supplied[COBOFS_ORBIT] && co->Supplied[COBOFS_CLOCK]))) {
         status[s][i] = 1;
@@ -480,6 +480,8 @@
   if ((unsigned char) h != 0xD3 || rs)
     return GCOBR_UNKNOWNDATA;
+
   if (size < sizeofrtcmblock + 3) /* 3 header bytes already removed */
     return GCOBR_MESSAGEEXCEEDSBUFFER;
+
   if (CRC24(sizeofrtcmblock + 3, (const unsigned char *) blockstart) !=
       (uint32_t) ((((unsigned char) buffer[sizeofrtcmblock]) << 16) |
@@ -487,12 +489,16 @@
           (((unsigned char) buffer[sizeofrtcmblock + 2]))))
     return GCOBR_CRCMISMATCH;
+
   size = sizeofrtcmblock; /* reduce size, so overflows are detected */
 
   D_RTCM_MESSAGE_NUMBER(type)
+
 #ifdef BNC_DEBUG_SSR
   fprintf(stderr, "type %d size %d\n",type,(int)sizeofrtcmblock);
 #endif
+
   if (bytesused)
     *bytesused = sizeofrtcmblock + 6;
+    
   if (type == VTEC_BASE) {
     unsigned int l, o, d;
@@ -547,4 +553,5 @@
     return mmi ? GCOBR_MESSAGEFOLLOWS : GCOBR_OK;
   }
+
   for (s = CLOCKORBIT_SATNUM; s-- > 0;) {
     if (type == PBTYPE_BASE + s) {
@@ -600,12 +607,12 @@
           D_GNSS_SIGNAL_IDENTIFIER(pb->Sat[pos].Biases[j].Type)
           D_INTEGER_INDICATOR(pb->Sat[pos].Biases[j].IntegerIndicator)
-          D_WIDE_LANE_INDICATOR(pb->Sat[pos].Biases[j].WidelaneGroupIndicator)
+         // D_WIDE_LANE_INDICATOR(pb->Sat[pos].Biases[j].WidelaneGroupIndicator)
           D_DISCONTINUITY_COUNTER(pb->Sat[pos].Biases[j].DiscontinuityCounter)
           D_PHASE_BIAS_CORRECTION(pb->Sat[pos].Biases[j].Bias)
 #ifdef BNC_DEBUG_SSR
-            fprintf(stderr, "t%02d int %d wl %d disc %d b %8.4f ",
+            fprintf(stderr, "t%02d int %d /*wl %d*/ disc %d b %8.4f ",
                     pb->Sat[pos].Biases[j].Type,
 					pb->Sat[pos].Biases[j].IntegerIndicator,
-					pb->Sat[pos].Biases[j].WidelaneGroupIndicator,
+					//pb->Sat[pos].Biases[j].WidelaneGroupIndicator,
 					pb->Sat[pos].Biases[j].DiscontinuityCounter,
 					pb->Sat[pos].Biases[j].Bias);
@@ -625,5 +632,5 @@
     else if (type >= corbase[s]) {
       unsigned int corrOffset = type - corbase[s];
-      if (corrOffset == COBOFS_ORBIT) {
+      if      (corrOffset == COBOFS_ORBIT) {
           if (!co)
             return GCOBR_NOCLOCKORBITPARAMETER;
@@ -925,5 +932,5 @@
           }
       }
-      else if (corrOffset ==  COBOFS_CBIAS) {
+      else if (corrOffset == COBOFS_CBIAS) {
           if (!b)
             return GCOBR_NOCODEBIASPARAMETER;