diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src
index 9c894c91e5fd407eaf8175a33627a70a90f0a7b5..2b21a39070bcbe168dfc79673113a530049f595d 100755
--- a/executablecode/Makefile.src
+++ b/executablecode/Makefile.src
@@ -1 +1 @@
-SRCS = generated_src/main.c generated_src/ObserverProp1.c generated_src/RemotelyControlledMicrowave.c generated_src/MicroWaveOven.c generated_src/Bell.c generated_src/ControlPanel.c generated_src/Controller.c generated_src/Magnetron.c generated_src/Door.c 
\ No newline at end of file
+SRCS = generated_src/main.c generated_src/System.c generated_src/Bob.c generated_src/Alice.c 
\ No newline at end of file
diff --git a/src/launcher/ExecutionThread.java b/src/launcher/ExecutionThread.java
index 22ea5d6db6ef1d5980ab0acc395b9e56fd3a9199..fa6760e024f828aaa0514908b7abb130c283559a 100755
--- a/src/launcher/ExecutionThread.java
+++ b/src/launcher/ExecutionThread.java
@@ -58,7 +58,7 @@ class ExecutionThread extends Thread {
     private RshServer rsh;
     private ServerSocket server = null;
     private boolean go;
-    BufferedReader proc_in;
+    BufferedReader proc_in, proc_err;
     private Process proc;
     
     private boolean piped;
@@ -165,7 +165,7 @@ class ExecutionThread extends Thread {
         proc = null;
         BufferedReader in = null;
         String str;
-        
+
         // print output in pipe
         if (mustWaitForPiped) {
             try {
@@ -178,10 +178,14 @@ class ExecutionThread extends Thread {
                 waitingForPipe();
                 TraceManager.addDev("Got pipe");
                 proc_in = new BufferedReader(new InputStreamReader(proc.getInputStream()));
+		proc_err = new BufferedReader(new InputStreamReader(proc.getErrorStream()));
                 try {
                     while (((str = proc_in.readLine()) != null) && (go == true)){
                         pipe.write((str + "\n").getBytes());
                     }
+                    while (((str = proc_err.readLine()) != null) && (go == true)){
+                        pipe.write((str + "\n").getBytes());
+                    }
                 } catch (IOException e) {
                     
                 }
@@ -229,6 +233,12 @@ class ExecutionThread extends Thread {
                     //TraceManager.addDev("out " + str);
                     respond(out, "4" + str);
                 }
+		proc_err = new BufferedReader(new InputStreamReader(proc.getErrorStream()));
+                while (((str = proc_err.readLine()) != null) && (go == true)){
+                	System.out.println("error out:" + str);
+                    //TraceManager.addDev("out " + str);
+                    respond(out, "4" + str);
+                }
                 /*int c;
                 while (((c = proc_in.read()) > 0) && (go == true)){
                 	System.out.println("char:" + (char)c);
diff --git a/src/ui/AvatarDesignPanelTranslator.java b/src/ui/AvatarDesignPanelTranslator.java
index ff82d1245673de103fa4abe5662f8efa058ce97c..ff9be58c8632d870565069d78b6dbeddea4dc181 100644
--- a/src/ui/AvatarDesignPanelTranslator.java
+++ b/src/ui/AvatarDesignPanelTranslator.java
@@ -119,7 +119,7 @@ public class AvatarDesignPanelTranslator {
         TraceManager.addDev("Removing else guards");
         as.removeElseGuards();
         TraceManager.addDev("Removing else guards ... done");
-	System.out.println(as.toString());
+	//System.out.println(as.toString());
         return as;
     }
 
diff --git a/src/ui/window/JDialogUPPAALValidation.java b/src/ui/window/JDialogUPPAALValidation.java
index 7659e689156eb2bf79aba574ad629ad746c6ebb4..bc2020464326a7d1479e8aa7006033adaba39755 100755
--- a/src/ui/window/JDialogUPPAALValidation.java
+++ b/src/ui/window/JDialogUPPAALValidation.java
@@ -362,7 +362,6 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
                     jta.append("Liveness: No selected component found on diagrams\n\n");
                 }
             }
-
             if (stateL.isSelected() && (mode != NOT_STARTED)) {
                 ArrayList<String> list = mgui.gtm.getUPPAALQueries(tp);
                 String s1, s2, name1, name2, query1, query2;
@@ -474,7 +473,7 @@ public class JDialogUPPAALValidation extends javax.swing.JDialog implements Acti
         if(showDetails.isSelected()) {
             jta.append(data);
         }
-
+	//NOTE: [error] is only visible if Error Stream is parsed
         if (mode != NOT_STARTED) {
             if (data.trim().length() == 0) {
                 //jta.append("The verifier of UPPAAL could not be started: error\n");