Index: src/tests/boundedBuffer.c
===================================================================
--- src/tests/boundedBuffer.c	(revision bfc0f401d6e87245b384a77e908b35f54769f4ba)
+++ src/tests/boundedBuffer.c	(revision 9f865d12e9ef03918c8d4e31688d6faa37969589)
@@ -1,2 +1,15 @@
+// 
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+// 
+// boundedBuffer.c -- 
+// 
+// Author           : Peter A. Buhr
+// Created On       : Mon Oct 30 12:45:13 2017
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Oct 30 18:00:10 2017
+// Update Count     : 7
+// 
+
 #include <stdlib>
 #include <fstream>
@@ -6,11 +19,11 @@
 
 monitor Buffer {
-    condition full, empty;
-    int front, back, count;
-    int elements[20];
+	condition full, empty;
+	int front, back, count;
+	int elements[20];
 };
 
 void ?{}( Buffer & buffer ) {
-    buffer.front = buffer.back = buffer.count = 0;
+	buffer.front = buffer.back = buffer.count = 0;
 }
 
@@ -18,84 +31,89 @@
 
 void insert( Buffer & mutex buffer, int elem ) {
-    if ( buffer.count == 20 ) wait( &buffer.empty );
-    buffer.elements[buffer.back] = elem;
-    buffer.back = ( buffer.back + 1 ) % 20;
-    buffer.count += 1;
-    signal( &buffer.full );
+	if ( buffer.count == 20 ) wait( &buffer.empty );
+	buffer.elements[buffer.back] = elem;
+	buffer.back = ( buffer.back + 1 ) % 20;
+	buffer.count += 1;
+	signal( &buffer.full );
 }
 int remove( Buffer & mutex buffer ) {
-    if ( buffer.count == 0 ) wait( &buffer.full );
-    int elem = buffer.elements[buffer.front];
-    buffer.front = ( buffer.front + 1 ) % 20;
-    buffer.count -= 1;
-    signal( &buffer.empty );
-    return elem;
+	if ( buffer.count == 0 ) wait( &buffer.full );
+	int elem = buffer.elements[buffer.front];
+	buffer.front = ( buffer.front + 1 ) % 20;
+	buffer.count -= 1;
+	signal( &buffer.empty );
+	return elem;
 }
 
 thread Producer {
-    Buffer * buffer;
-    unsigned int N;
+	Buffer & buffer;
+	unsigned int N;
 };
 void main( Producer & prod ) {
-    for ( int i = 1; i <= prod.N; i += 1 ) {
-	yield( (unsigned int)rand48() % 5 );
-	insert( *prod.buffer, 1 );
-    } // for
-    insert( *prod.buffer, -1 );
+	for ( int i = 1; i <= prod.N; i += 1 ) {
+		yield( rand48( 5 ) );
+		insert( prod.buffer, 1 );
+	} // for
+	insert( prod.buffer, -1 );
 }
 void ?{}( Producer & prod, Buffer * buffer, unsigned int N ) {
-    prod.buffer = buffer;
-    prod.N = N;
-}
+	&prod.buffer = buffer;
+	prod.N = N;
+		}
 
 thread Consumer {
-    Buffer * buffer;
-    int * sum;						// summation of producer values
+	Buffer & buffer;
+	int & sum;						// summation of producer values
 };
 void main( Consumer & cons ) {
-    *cons.sum = 0;
-    for ( ;; ) {
-	yield( (unsigned int)rand48() % 5 );
-	int item = remove( *cons.buffer );
-      if ( item == -1 ) break;				// sentinel ?
-    	*cons.sum += item;
-    } // for
+	cons.sum = 0;
+	for ( ;; ) {
+		yield( rand48( 5 ) );
+		int item = remove( cons.buffer );
+		if ( item == -1 ) break;				// sentinel ?
+		cons.sum += item;
+	} // for
 }
 void ?{}( Consumer & cons, Buffer * buffer, int * sum ) {
-    cons.buffer = buffer;
-    cons.sum = sum;
+	&cons.buffer = buffer;
+	&cons.sum = sum;
 }
 
 int main() {
-    Buffer buffer;
-    enum { Prods = 5, Cons = 5 };
-    Producer * prods[Prods];
-    Consumer * cons[Cons];
-    const int Sentinel = -1;
-    int sums[Cons];
-    int i;
-    processor p;
+	Buffer buffer;
+	enum { Prods = 5, Cons = 5 };
+	Producer * prods[Prods];
+	Consumer * cons[Cons];
+	const int Sentinel = -1;
+	int sums[Cons];
+	int i;
+	processor p;
 
-    //rand48seed( getpid() );
-    rand48seed( 1003 );
+	//rand48seed( getpid() );
+	rand48seed( 1003 );
 
-    for ( i = 0; i < Cons; i += 1 ) {			// create consumers
-	cons[i] = new( &buffer, &sums[i] );
-    } // for
-    for ( i = 0; i < Prods; i += 1 ) {			// create producers
-	prods[i] = new( &buffer, 100000u );
-    } // for
+	for ( i = 0; i < Cons; i += 1 ) {			// create consumers
+		cons[i] = new( &buffer, &sums[i] );
+	} // for
+	for ( i = 0; i < Prods; i += 1 ) {			// create producers
+		prods[i] = new( &buffer, 100000u );
+	} // for
 
-    for ( i = 0; i < Prods; i += 1 ) {			// wait for producers to finish
-	delete( prods[i] );
-    } // for
-    for ( i = 0; i < Cons; i += 1 ) {			// generate sentinal values to stop consumers
-	insert( buffer, Sentinel );
-    } // for
-    int sum = 0;
-    for ( i = 0; i < Cons; i += 1 ) {			// wait for consumers to finish
-	delete( cons[i] );
-	sum += sums[i];
-    } // for
-    sout | "total:" | sum | endl;
+	for ( i = 0; i < Prods; i += 1 ) {			// wait for producers to finish
+		delete( prods[i] );
+	} // for
+	for ( i = 0; i < Cons; i += 1 ) {			// generate sentinal values to stop consumers
+		insert( buffer, Sentinel );
+	} // for
+	int sum = 0;
+	for ( i = 0; i < Cons; i += 1 ) {			// wait for consumers to finish
+		delete( cons[i] );
+		sum += sums[i];
+	} // for
+	sout | "total:" | sum | endl;
 }
+
+// Local Variables: //
+// tab-width: 4 //
+// compile-command: "cfa boundedBuffer.c" //
+// End: //
Index: src/tests/matrixSum.c
===================================================================
--- src/tests/matrixSum.c	(revision bfc0f401d6e87245b384a77e908b35f54769f4ba)
+++ src/tests/matrixSum.c	(revision 9f865d12e9ef03918c8d4e31688d6faa37969589)
@@ -11,6 +11,6 @@
 // Created On       : Mon Oct  9 08:29:28 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Oct  9 08:30:08 2017
-// Update Count     : 1
+// Last Modified On : Sun Oct 29 21:08:48 2017
+// Update Count     : 2
 // 
 
@@ -20,5 +20,5 @@
 
 thread Adder {
-    int * row, cols, * subtotal;			// communication
+    int * row, cols, * subtotal;						// communication
 };
 
@@ -32,5 +32,5 @@
     *adder.subtotal = 0;
     for ( int c = 0; c < adder.cols; c += 1 ) {
-	*adder.subtotal += adder.row[c];
+		*adder.subtotal += adder.row[c];
     } // for
 }
@@ -39,19 +39,19 @@
     const int rows = 10, cols = 1000;
     int matrix[rows][cols], subtotals[rows], total = 0;
-    processor p;					// extra kernel thread
+    processor p;										// extra kernel thread
 
     for ( int r = 0; r < rows; r += 1 ) {
-	for ( int c = 0; c < cols; c += 1 ) {
-	    matrix[r][c] = 1;
-	} // for
+		for ( int c = 0; c < cols; c += 1 ) {
+			matrix[r][c] = 1;
+		} // for
     } // for
     Adder * adders[rows];
-    for ( int r = 0; r < rows; r += 1 ) {		// start threads to sum rows
-	adders[r] = &(*malloc()){ matrix[r], cols, subtotals[r] };
-//	adders[r] = new( matrix[r], cols, &subtotals[r] );
+    for ( int r = 0; r < rows; r += 1 ) {				// start threads to sum rows
+		adders[r] = &(*malloc()){ matrix[r], cols, subtotals[r] };
+//		adders[r] = new( matrix[r], cols, &subtotals[r] );
     } // for
-    for ( int r = 0; r < rows; r += 1 ) {		// wait for threads to finish
-	delete( adders[r] );
-	total += subtotals[r];				// total subtotals
+    for ( int r = 0; r < rows; r += 1 ) {				// wait for threads to finish
+		delete( adders[r] );
+		total += subtotals[r];							// total subtotals
     } // for
     sout | total | endl;
Index: src/tests/prodcons.c
===================================================================
--- src/tests/prodcons.c	(revision bfc0f401d6e87245b384a77e908b35f54769f4ba)
+++ src/tests/prodcons.c	(revision 9f865d12e9ef03918c8d4e31688d6faa37969589)
@@ -10,6 +10,6 @@
 // Created On       : Mon Sep 18 12:23:39 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Sep 20 17:03:28 2017
-// Update Count     : 40
+// Last Modified On : Mon Oct 30 18:01:19 2017
+// Update Count     : 41
 // 
 
@@ -30,6 +30,6 @@
 	// 1st resume starts here
 	for ( int i = 0; i < prod.N; i += 1 ) {
-		int p1 = (unsigned int)rand48() % 100;			// non-negative
-		int p2 = (unsigned int)rand48() % 100;
+		int p1 = rand48( 100 );
+		int p2 = rand48( 100 );
 		sout | p1 | " " | p2 | endl;
 		int status = delivery( *prod.c, p1, p2 );