Index: src/benchmark/Makefile.am
===================================================================
--- src/benchmark/Makefile.am	(revision 22ef6a5b9c28f266294a23e0f40f1f0e2e145c14)
+++ src/benchmark/Makefile.am	(revision 25ba99989ac95d7ff7b36866920921f955fcf7c8)
@@ -27,4 +27,6 @@
 
 noinst_PROGRAMS =
+
+all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
 
 bench$(EXEEXT) :
@@ -63,27 +65,4 @@
 ctxswitch-pthread$(EXEEXT):
 	@BACKEND_CC@ ctxswitch/pthreads.c  -DBENCH_N=50000000  -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
-
-## =========================================================================================================
-creation$(EXEEXT) :\
-	creation-pthread.run		\
-	creation-cfa_coroutine.run	\
-	creation-cfa_thread.run		\
-	creation-upp_coroutine.run	\
-	creation-upp_thread.run
-
-creation-cfa_coroutine$(EXEEXT):
-	${CC}        creation/cfa_cor.c   -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
-
-creation-cfa_thread$(EXEEXT):
-	${CC}        creation/cfa_thrd.c  -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
-
-creation-upp_coroutine$(EXEEXT):
-	u++          creation/upp_cor.cc  -DBENCH_N=50000000   -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
-
-creation-upp_thread$(EXEEXT):
-	u++          creation/upp_thrd.cc -DBENCH_N=50000000   -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
-
-creation-pthread$(EXEEXT):
-	@BACKEND_CC@ creation/pthreads.c  -DBENCH_N=250000     -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 ## =========================================================================================================
@@ -153,4 +132,27 @@
 
 ## =========================================================================================================
+creation$(EXEEXT) :\
+	creation-pthread.run		\
+	creation-cfa_coroutine.run	\
+	creation-cfa_thread.run		\
+	creation-upp_coroutine.run	\
+	creation-upp_thread.run
+
+creation-cfa_coroutine$(EXEEXT):
+	${CC}        creation/cfa_cor.c   -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+
+creation-cfa_thread$(EXEEXT):
+	${CC}        creation/cfa_thrd.c  -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+
+creation-upp_coroutine$(EXEEXT):
+	u++          creation/upp_cor.cc  -DBENCH_N=50000000   -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+
+creation-upp_thread$(EXEEXT):
+	u++          creation/upp_thrd.cc -DBENCH_N=50000000   -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+
+creation-pthread$(EXEEXT):
+	@BACKEND_CC@ creation/pthreads.c  -DBENCH_N=250000     -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+
+## =========================================================================================================
 
 %.run : %$(EXEEXT) ${REPEAT}
Index: src/benchmark/Makefile.in
===================================================================
--- src/benchmark/Makefile.in	(revision 22ef6a5b9c28f266294a23e0f40f1f0e2e145c14)
+++ src/benchmark/Makefile.in	(revision 25ba99989ac95d7ff7b36866920921f955fcf7c8)
@@ -444,4 +444,6 @@
 .NOTPARALLEL:
 
+all : ctxswitch$(EXEEXT) mutex$(EXEEXT) signal$(EXEEXT) waitfor$(EXEEXT) creation$(EXEEXT)
+
 bench$(EXEEXT) :
 	@for ccflags in "-debug" "-nodebug"; do \
@@ -479,26 +481,4 @@
 	@BACKEND_CC@ ctxswitch/pthreads.c  -DBENCH_N=50000000  -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
-creation$(EXEEXT) :\
-	creation-pthread.run		\
-	creation-cfa_coroutine.run	\
-	creation-cfa_thread.run		\
-	creation-upp_coroutine.run	\
-	creation-upp_thread.run
-
-creation-cfa_coroutine$(EXEEXT):
-	${CC}        creation/cfa_cor.c   -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
-
-creation-cfa_thread$(EXEEXT):
-	${CC}        creation/cfa_thrd.c  -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
-
-creation-upp_coroutine$(EXEEXT):
-	u++          creation/upp_cor.cc  -DBENCH_N=50000000   -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
-
-creation-upp_thread$(EXEEXT):
-	u++          creation/upp_thrd.cc -DBENCH_N=50000000   -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
-
-creation-pthread$(EXEEXT):
-	@BACKEND_CC@ creation/pthreads.c  -DBENCH_N=250000     -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
-
 mutex$(EXEEXT) :\
 	mutex-function.run	\
@@ -562,4 +542,26 @@
 waitfor-cfa4$(EXEEXT):
 	${CC}        schedext/cfa4.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+
+creation$(EXEEXT) :\
+	creation-pthread.run		\
+	creation-cfa_coroutine.run	\
+	creation-cfa_thread.run		\
+	creation-upp_coroutine.run	\
+	creation-upp_thread.run
+
+creation-cfa_coroutine$(EXEEXT):
+	${CC}        creation/cfa_cor.c   -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+
+creation-cfa_thread$(EXEEXT):
+	${CC}        creation/cfa_thrd.c  -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+
+creation-upp_coroutine$(EXEEXT):
+	u++          creation/upp_cor.cc  -DBENCH_N=50000000   -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+
+creation-upp_thread$(EXEEXT):
+	u++          creation/upp_thrd.cc -DBENCH_N=50000000   -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+
+creation-pthread$(EXEEXT):
+	@BACKEND_CC@ creation/pthreads.c  -DBENCH_N=250000     -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 %.run : %$(EXEEXT) ${REPEAT}
Index: src/benchmark/SchedInt.c
===================================================================
--- src/benchmark/SchedInt.c	(revision 22ef6a5b9c28f266294a23e0f40f1f0e2e145c14)
+++ 	(revision )
@@ -1,83 +1,0 @@
-#include <fstream>
-#include <stdlib>
-#include <thread>
-
-#include "bench.h"
-
-condition condA; 
-condition condB;
-condition condC;
-condition condD;
-
-monitor mon_t {};
-
-mon_t mon1, mon2;
-
-thread thrdA {};
-thread thrdB {};
-thread thrdC {};
-thread thrdD {};
-
-//-------------------------------------------------------------------
-// 1 monitor signal cycle
-void sideA( mon_t * mutex a ) {
-	long long int StartTime, EndTime;
-
-	StartTime = Time();
-	for( int i = 0;; i++ ) {
-		signal(&condA);
-		if( i > N ) break;
-		wait(&condB);
-	}
-	EndTime = Time();
-
-	sout | ( EndTime - StartTime ) / N;
-}
-
-void sideB( mon_t * mutex a ) {
-	for( int i = 0;; i++ ) {
-		signal(&condB);
-		if( i > N ) break;
-		wait(&condA);
-	}
-}
-
-//-------------------------------------------------------------------
-// 2 monitor signal cycle
-void sideC( mon_t * mutex a, mon_t * mutex b ) {
-	long long int StartTime, EndTime;
-
-	StartTime = Time();
-	for( int i = 0;; i++ ) {
-		signal(&condC);
-		if( i > N ) break;
-		wait(&condD);
-	}
-	EndTime = Time();
-
-	sout | ( EndTime - StartTime ) / N | endl;
-}
-
-void sideD( mon_t * mutex a, mon_t * mutex b ) {
-	for( int i = 0;; i++ ) {
-		signal(&condD);
-		if( i > N ) break;
-		wait(&condC);
-	}
-}
-
-void main( thrdA * this ) { sideA( &mon1 ); }
-void main( thrdB * this ) { sideB( &mon1 ); }
-void main( thrdC * this ) { sideC( &mon1, &mon2 ); }
-void main( thrdD * this ) { sideD( &mon1, &mon2 ); }
-
-int main() {
-	{
-		thrdA a;
-		thrdB b;
-	}
-	{
-		thrdC c;
-		thrdD d;
-	}
-}
Index: src/benchmark/csv-data.c
===================================================================
--- src/benchmark/csv-data.c	(revision 22ef6a5b9c28f266294a23e0f40f1f0e2e145c14)
+++ src/benchmark/csv-data.c	(revision 25ba99989ac95d7ff7b36866920921f955fcf7c8)
@@ -111,7 +111,7 @@
 	StartTime = Time();
 	for( int i = 0;; i++ ) {
-		signal(&cond1a);
-		if( i > N ) break;
-		wait(&cond1b);
+		signal(cond1a);
+		if( i > N ) break;
+		wait(cond1b);
 	}
 	EndTime = Time();
@@ -122,7 +122,7 @@
 void side1B( mon_t & mutex a ) {
 	for( int i = 0;; i++ ) {
-		signal(&cond1b);
-		if( i > N ) break;
-		wait(&cond1a);
+		signal(cond1b);
+		if( i > N ) break;
+		wait(cond1a);
 	}
 }
@@ -159,7 +159,7 @@
 	StartTime = Time();
 	for( int i = 0;; i++ ) {
-		signal(&cond2a);
-		if( i > N ) break;
-		wait(&cond2b);
+		signal(cond2a);
+		if( i > N ) break;
+		wait(cond2b);
 	}
 	EndTime = Time();
@@ -170,7 +170,7 @@
 void side2B( mon_t & mutex a, mon_t & mutex b ) {
 	for( int i = 0;; i++ ) {
-		signal(&cond2b);
-		if( i > N ) break;
-		wait(&cond2a);
+		signal(cond2b);
+		if( i > N ) break;
+		wait(cond2a);
 	}
 }
Index: src/benchmark/schedint/cfa1.c
===================================================================
--- src/benchmark/schedint/cfa1.c	(revision 22ef6a5b9c28f266294a23e0f40f1f0e2e145c14)
+++ src/benchmark/schedint/cfa1.c	(revision 25ba99989ac95d7ff7b36866920921f955fcf7c8)
@@ -15,5 +15,5 @@
 
 void __attribute__((noinline)) call( M & mutex a1 ) {
-	signal(&c);
+	signal(c);
 }
 
@@ -22,5 +22,5 @@
 	BENCH(
 		for (size_t i = 0; i < n; i++) {
-			wait(&c);
+			wait(c);
 		},
 		result
Index: src/benchmark/schedint/cfa2.c
===================================================================
--- src/benchmark/schedint/cfa2.c	(revision 22ef6a5b9c28f266294a23e0f40f1f0e2e145c14)
+++ src/benchmark/schedint/cfa2.c	(revision 25ba99989ac95d7ff7b36866920921f955fcf7c8)
@@ -15,5 +15,5 @@
 
 void __attribute__((noinline)) call( M & mutex a1, M & mutex a2 ) {
-	signal(&c);
+	signal(c);
 }
 
@@ -22,5 +22,5 @@
 	BENCH(
 		for (size_t i = 0; i < n; i++) {
-			wait(&c);
+			wait(c);
 		},
 		result
Index: src/benchmark/schedint/cfa4.c
===================================================================
--- src/benchmark/schedint/cfa4.c	(revision 22ef6a5b9c28f266294a23e0f40f1f0e2e145c14)
+++ src/benchmark/schedint/cfa4.c	(revision 25ba99989ac95d7ff7b36866920921f955fcf7c8)
@@ -15,5 +15,5 @@
 
 void __attribute__((noinline)) call( M & mutex a1, M & mutex a2, M & mutex a3, M & mutex a4 ) {
-	signal(&c);
+	signal(c);
 }
 
@@ -22,5 +22,5 @@
 	BENCH(
 		for (size_t i = 0; i < n; i++) {
-			wait(&c);
+			wait(c);
 		},
 		result