Index: /soft/giet_vm/giet_kernel/ctx_handler.c
===================================================================
--- /soft/giet_vm/giet_kernel/ctx_handler.c	(revision 329)
+++ /soft/giet_vm/giet_kernel/ctx_handler.c	(revision 330)
@@ -80,6 +80,7 @@
         unsigned int* next_ctx_vaddr = &(psched->context[next_task_id][0]);
 
-        // reset timer counter. In each cluster,
-        // the NB_PROCS_MAX timers are system timers (TICK)
+        // reset timer counter. 
+        // In all clusters, the first NB_PROCS_MAX
+        // timers are system timers (TICK)
 
 #if USE_XCU
Index: /soft/giet_vm/giet_kernel/kernel_init.c
===================================================================
--- /soft/giet_vm/giet_kernel/kernel_init.c	(revision 329)
+++ /soft/giet_vm/giet_kernel/kernel_init.c	(revision 330)
@@ -151,5 +151,4 @@
     unsigned int lpid       = global_pid % NB_PROCS_MAX;
     unsigned int pid        = ((( x * Y_SIZE) + y) * NB_PROCS_MAX) + lpid;
-//  unsigned int pid        = _get_id(i n_procs );
 
     // This last initialisation phase is done sequencially:
@@ -332,6 +331,8 @@
     unsigned int epc_value  = _get_task_slot(global_pid, ltid, CTX_EPC_ID);
 
-    _printf("\n[GIET DEBUG INIT] Processor[%d,%d,%d] reach barrier at cycle %d\n",
-            x, y, lpid, _get_proctime() );
+#if GIET_DEBUG_INIT
+_printf("\n[GIET DEBUG INIT] Processor[%d,%d,%d] reach barrier at cycle %d\n",
+        x, y, lpid, _get_proctime() );
+#endif
 
     // increment barrier counter