diff --git a/executablecode/Makefile.src b/executablecode/Makefile.src
index 28b9acb23f0af46aef4caec4f72c265800a703d3..1a5aafcafa7abcf094ea1b3c9d8808777263ed3e 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/RemoteControl.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 generated_src/WirelessInterface.c 
\ No newline at end of file
+SRCS = generated_src/main.c generated_src/ObserverProp1.c generated_src/RemotelyControlledMicrowave.c generated_src/MicroWaveOven.c generated_src/WirelessInterface.c generated_src/Door.c generated_src/Magnetron.c generated_src/Controller.c generated_src/ControlPanel.c generated_src/Bell.c generated_src/RemoteControl.c 
\ No newline at end of file
diff --git a/src/avatartranslator/AvatarStateMachine.java b/src/avatartranslator/AvatarStateMachine.java
index 54de45e09f8fe2eb2ad491e737619d071532b6d2..eb90fee6685d93607b8890af8dd0083b51da2064 100644
--- a/src/avatartranslator/AvatarStateMachine.java
+++ b/src/avatartranslator/AvatarStateMachine.java
@@ -111,8 +111,8 @@ public class AvatarStateMachine extends AvatarElement {
 		LinkedList<AvatarStateMachineElement> toRemove = new LinkedList<AvatarStateMachineElement>();
 		
 		while((at = getCompositeTransition()) != null) {
-			//TraceManager.addDev("*** Found composite transition: " + at.toString());
-			//TraceManager.addDev(_block.toString());
+			TraceManager.addDev("*** Found composite transition: " + at.toString());
+			TraceManager.addDev(_block.toString());
 			if (!(toRemove.contains(getPreviousElementOf(at)))) {
 				toRemove.add(getPreviousElementOf(at));
 			}
diff --git a/src/myutil/BoolExpressionEvaluator.java b/src/myutil/BoolExpressionEvaluator.java
index 114ae48859355a6733c43d46af6aa8c618cc6092..61aa88b858e80d6380ffef3d1e61c9ea26fe01a0 100755
--- a/src/myutil/BoolExpressionEvaluator.java
+++ b/src/myutil/BoolExpressionEvaluator.java
@@ -557,7 +557,11 @@ public class BoolExpressionEvaluator {
 			currentType = WHITE_SPACE_TOKEN;
 			TraceManager.addDev("White space found: looping");
 			computeNextToken1();
+			return;
 		}
+		
+		// Invalid token
+		errorMessage = "Unknown element: " + s;
 	}
 	
 	
diff --git a/src/tmltranslator/tmlcp/TMLSDInstance.java b/src/tmltranslator/tmlcp/TMLSDInstance.java
index 275a347d9b694517c961102bda5f60cd0b2d0081..e30002db019580082a05d869dcf0fcb70eaa547e 100755
--- a/src/tmltranslator/tmlcp/TMLSDInstance.java
+++ b/src/tmltranslator/tmlcp/TMLSDInstance.java
@@ -52,6 +52,7 @@ import java.util.*;
 import myutil.*;
 
 public class TMLSDInstance extends TMLElement  {
+		
 	private ArrayList<TMLSDElement> elements;
 	
     public TMLSDInstance(String _name, Object _referenceObject) {