diff --git a/Pcie40Libraries/pcie40_b2slc.cpp b/Pcie40Libraries/pcie40_b2slc.cpp
index 079f15db1e0d1a1050ac75de14f5387f30551481..dfe6a06d28fd2a26ec1c18918cd0a965e63f237b 100644
--- a/Pcie40Libraries/pcie40_b2slc.cpp
+++ b/Pcie40Libraries/pcie40_b2slc.cpp
@@ -73,7 +73,7 @@ int pcie40_readData( int dev , int ch , std::vector< int > & result , int length
   unsigned ret = 0 ;
   int i = 0 ; 
   for ( i = 0 ; i < length ; ++i ) {
-    ret = ecs_read( dev , SLC_BAR , SLC_RFIFO_ADD + fd * 0x20 );
+    ret = ecs_read( dev , SLC_BAR , SLC_RFIFO_ADD + ch * 0x20 );
     result.push_back( ret ) ;
   }
   return 0 ;
@@ -92,13 +92,12 @@ int pcie40_readfee8( int dev , int ch , int adr) {
 
   // Fill the FIFO with the requested information: write MSB first
   std::vector< int > data ;
-  data.push_back( 
-    0xFFFE ,
-    0x0001 ,
-    0x8000 | ( adr & 0x7F ) ,
-    0x000c ,
-    0xEEEE
-  )
+  data.push_back( 0xFFFE ) ; 
+  data.push_back( 0x0001 ) ; 
+  data.push_back( 0x8000 | ( adr & 0x7F ) ) ; 
+  data.push_back( 0x000c ) ; 
+  data.push_back( 0xEEEE ) ;
+
   ret = pcie40_writeToFifo( dev , ch , data ) ;
   if ( ret != 0 ) return ret ;
 
@@ -135,13 +134,11 @@ int pcie40_writefee8( int dev , int ch , int adr , int val ) {
 
   // Fill the FIFO with the requested information: write MSB first
   std::vector< int > data ;
-  data.push_back( 
-    0xFFFF ,
-    0x0001 ,
-    0x8000 | ( adr & 0x7F ) ,
-    0x0000 | ( val & 0xFF ) ,
-    0xEEEE
-  )
+  data.push_back( 0xFFFF ) ; 
+  data.push_back( 0x0001 ) ; 
+  data.push_back( 0x8000 | ( adr & 0x7F ) ) ; 
+  data.push_back( 0x0000 | ( val & 0xFF ) ) ;
+  data.push_back( 0xEEEE ) ;
   ret = pcie40_writeToFifo( dev , ch , data ) ;
   if ( ret != 0 ) return ret ;
 
@@ -165,12 +162,11 @@ unsigned long pcie40_readfee32( int dev , int ch , int adr ) {
 
   // Fill the FIFO with the requested information: write MSB first
   std::vector< int > data ;
-  data.push_back( 
-    0xFFFB ,
-    0x7000 | ( ( adr & 0xFF00 ) >> 8 ) ,
-    0x7000 | ( adr & 0xFF ) ,
-    0xEEEE
-  )
+  data.push_back( 0xFFFB ) ; 
+  data.push_back( 0x7000 | ( ( adr & 0xFF00 ) >> 8 ) ) ; 
+  data.push_back( 0x7000 | ( adr & 0xFF ) ) ; 
+  data.push_back( 0xEEEE ) ;
+
   ret = pcie40_writeToFifo( dev , ch , data ) ;
   if ( ret != 0 ) return ret ;
 
@@ -261,16 +257,15 @@ int pcie40_writefee32( int dev , int ch , int adr , int val ) {
 
   // Fill the FIFO with the requested information: write MSB first
   std::vector< int > data ;
-  data.push_back( 
-    0xFFFC ,
-    0x7000 | ( ( adr & 0xFF00 ) >> 8 ) ,
-    0x7000 | ( adr & 0xFF ) ,
-    0x7000 | val4 ,
-    0x7000 | val3 ,
-    0x7000 | val2 ,
-    0x7000 | val1 ,
-    0xEEEE
-  )
+  data.push_back( 0xFFFC ) ; 
+  data.push_back( 0x7000 | ( ( adr & 0xFF00 ) >> 8 ) ) ; 
+  data.push_back( 0x7000 | ( adr & 0xFF ) ) ; 
+  data.push_back( 0x7000 | val4 ) ; 
+  data.push_back( 0x7000 | val3 ) ; 
+  data.push_back( 0x7000 | val2 ) ; 
+  data.push_back( 0x7000 | val1 ) : 
+  data.push_back( 0xEEEE ) ;
+
   ret = pcie40_writeToFifo( dev , ch , data ) ;
   if ( ret != 0 ) return ret ;
 
@@ -318,8 +313,7 @@ int pcie40_writestream( int dev , int ch , char * filename ) {
     if ( count == 0 ) 
       data.push_back( 0xFFFD ) ; 
     count++ ; 
-    data.push_back( (int) ( ( ( 0x70 << 8 ) | ( c & 0xFF ) ) & 
-      0xFFFFFFFF ) ) ;
+    data.push_back( (int) ( ( ( 0x70 << 8 ) | ( c & 0xFF ) ) & 0xFFFFFFFF ) ) ;
 
     if ( 14 == count ) {
       data.push_back( 0xEEEE ) ;