diff --git a/src/dseengine/DSEConfiguration.java b/src/dseengine/DSEConfiguration.java
index 62029885d9c9cc6f839e23a566e03085d9077b8d..f1e885e2c3efc9e26d2b5d19845833887ef409df 100755
--- a/src/dseengine/DSEConfiguration.java
+++ b/src/dseengine/DSEConfiguration.java
@@ -155,7 +155,7 @@ public class DSEConfiguration  {
 		}
 		
 		if (ret) {
-			//System.out.println("Format OK");
+			System.out.println("Format OK");
 			tmap = spec.getTMLMapping(); 
 			tmlm = tmap.getTMLModeling();
 			
@@ -168,15 +168,15 @@ public class DSEConfiguration  {
 			TraceManager.addDev("--- Checking syntax of the whole specification (TML, TARCHI, TMAP)---");
 			TMLSyntaxChecking syntax = new TMLSyntaxChecking(tmap);
 			syntax.checkSyntax();
-			if (syntax.hasErrors() != 0) {
-				return false;
-			}
-			
-			if (!ret) {
-				TraceManager.addDev("Compilation:\n" + syntax.printSummary());
+			if (syntax.hasErrors() > 0) {
+				TraceManager.addDev("Printing errors:");
+				TraceManager.addDev(syntax.printErrors());
 				return false;
 			}
 			
+
+			TraceManager.addDev("Compilation:\n" + syntax.printSummary());
+		
 			TraceManager.addDev("Compilation:\n" + spec.printSummary());
 			
 			
@@ -185,10 +185,10 @@ public class DSEConfiguration  {
 				TraceManager.addDev(tmlm.printSummary(warnings));
 			}
 			//spec.toTextFormat(tmlm);
-			//System.out.println("TMLModeling=" + spec);
+			System.out.println("TMLModeling=" + spec);
 		}
 		
-		return ret;
+		return true;
 	}
 	
 	public int runSimulation(boolean _debug, boolean _optimize) {
@@ -220,17 +220,19 @@ public class DSEConfiguration  {
 		TraceManager.addDev("Loading mapping");
 		if (!loadMapping(_optimize)) {
 			errorMessage = LOAD_MAPPING_FAILED;
+			TraceManager.addDev("Loading of the mapping faild!!!!");
 			return -1;
 		}
 		
 		// Generating code
-		TraceManager.addDev("Generating simulation code...");
+		TraceManager.addDev("\n\n\n**** Generating simulation code...");
 		TML2MappingSystemC map = new TML2MappingSystemC(tmap);
-		map.generateSystemC(_debug, _optimize);
 		try {
+			map.generateSystemC(_debug, _optimize);
 			map.saveFile(pathToSimulator, "appmodel");
 		} catch (Exception e) {
-			TraceManager.addDev("SystemC generation failed: " + e.getMessage());
+			TraceManager.addDev("SystemC generation failed: " + e + " msg=" + e.getMessage());
+			e.printStackTrace();
 			return -1;
 		}
 		
diff --git a/src/tmltranslator/TMLSyntaxChecking.java b/src/tmltranslator/TMLSyntaxChecking.java
index efe7d35b20c201fb609c9de7c94d73fa720b053b..e573cfd73a323536d177f8e96d329c10890f84f0 100755
--- a/src/tmltranslator/TMLSyntaxChecking.java
+++ b/src/tmltranslator/TMLSyntaxChecking.java
@@ -162,7 +162,7 @@ public class TMLSyntaxChecking {
 				
 				if (elt instanceof TMLSendEvent) {
 					evt = ((TMLSendEvent)elt).getEvent();
-                     TraceManager.addDev("send evt= " + evt.getName() + " task=" + t.getName() + " origin=" + evt.getOriginTask().getName());
+                     //TraceManager.addDev("send evt= " + evt.getName() + " task=" + t.getName() + " origin=" + evt.getOriginTask().getName());
 					if (evt.getOriginTask() != t) {
 						addError(t, elt, evt.getName() + ": " + WRONG_ORIGIN_EVENT, TMLError.ERROR_BEHAVIOR);
 					}
@@ -170,7 +170,7 @@ public class TMLSyntaxChecking {
 				
 				if (elt instanceof TMLWaitEvent) {
 					evt = ((TMLWaitEvent)elt).getEvent();
-                    TraceManager.addDev("wait evt= " + evt.getName() + " task=" + t.getName() + " destination=" + evt.getDestinationTask().getName());
+                    //TraceManager.addDev("wait evt= " + evt.getName() + " task=" + t.getName() + " destination=" + evt.getDestinationTask().getName());
 					if (evt.getDestinationTask() != t) {
 						addError(t, elt, evt.getName() + ": " + WRONG_DESTINATION_EVENT, TMLError.ERROR_BEHAVIOR);
 					}
@@ -478,7 +478,7 @@ public class TMLSyntaxChecking {
 	}
 	
 	public String printErrors() {
-		String ret = "";
+		String ret = "*** ERRORS:";
 		for(TMLError error: errors) {
 			ret += "ERROR / task " + error.task.getName() + " / element " + error.element.getName() + ": " + error.message + "\n";
 		}
diff --git a/src/tmltranslator/TMLTextSpecification.java b/src/tmltranslator/TMLTextSpecification.java
index ff86c6d4eaa1aea83192e07a45667ab426f81d18..9d14e139182f067b3e38f44be360584f1029c196 100755
--- a/src/tmltranslator/TMLTextSpecification.java
+++ b/src/tmltranslator/TMLTextSpecification.java
@@ -2378,11 +2378,11 @@ public class TMLTextSpecification {
 		}
 		
 		if (_input.startsWith("ORIF(")) {
-				_input = "ORIF (" + _input.substring(7, _input.length());
+				_input = "ORIF (" + _input.substring(5, _input.length());
 		}
 		
 		if (_input.startsWith("ORIF (")) {
-				tmp = _input.substring(8, _input.length());
+				tmp = _input.substring(6, _input.length());
 				tmp = Conversion.replaceAllString(tmp, " ", "");
 				return "ORIF (" + tmp;
 		}