diff --git a/executablecode/generated_src/README b/executablecode/generated_src/README
new file mode 100644
index 0000000000000000000000000000000000000000..ee237081402c351c15e49c1bed006dae4436fb0a
--- /dev/null
+++ b/executablecode/generated_src/README
@@ -0,0 +1 @@
+Directory where generated code obtained from AVATAR models is saved
\ No newline at end of file
diff --git a/simulators/c++2/lib/README b/simulators/c++2/lib/README
deleted file mode 100644
index e56bd6b8c0ac10ae2726c756dff6630bb2af6bd0..0000000000000000000000000000000000000000
--- a/simulators/c++2/lib/README
+++ /dev/null
@@ -1 +0,0 @@
-Dir used to store .o files generated by the simulator compilation 
\ No newline at end of file
diff --git a/src/main/java/tmltranslator/toavatar/FullTML2Avatar.java b/src/main/java/tmltranslator/toavatar/FullTML2Avatar.java
index eca37ef591c68229d98cbb260a03e06a7723e9a9..c452cea1f2e0fb57a728304ec7b8a9b19f84cb3e 100644
--- a/src/main/java/tmltranslator/toavatar/FullTML2Avatar.java
+++ b/src/main/java/tmltranslator/toavatar/FullTML2Avatar.java
@@ -1305,7 +1305,7 @@ public class FullTML2Avatar {
                 elementList.add(initState);
                 //Build transition to choice
                 tran = new AvatarTransition(block, "loop_init__" + ae.getName(), ae.getReferenceObject());
-                tran.addAction(AvatarTerm.createActionFromString(block, "loop_index=0"));
+                tran.addAction("loop_index=0");
                 elementList.add(tran);
                 initState.addNext(tran);
                 //Choice state
@@ -1316,7 +1316,7 @@ public class FullTML2Avatar {
                 tran = new AvatarTransition(block, "loop_increment__" + ae.getName(), ae.getReferenceObject());
                 //Set default loop limit guard
                 tran.setGuard(AvatarGuard.createFromString(block, "loop_index != " + loopLimit));
-                tran.addAction(AvatarTerm.createActionFromString(block, "loop_index = loop_index + 1"));
+                //tran.addAction(AvatarTerm.createActionFromString(block, "loop_index = loop_index + 1"));
                 tran.addNext(elements.get(0));
                 as.addNext(tran);
                 elementList.add(tran);
@@ -1621,8 +1621,8 @@ public class FullTML2Avatar {
 				     tmp = new AvatarAttribute("aliceandbob_encrypted", AvatarType.INTEGER, block, null);
 				     block.addAttribute(tmp);*/
 
-            //AvatarAttribute loop_index = new AvatarAttribute("loop_index", AvatarType.INTEGER, block, null);
-            //block.addAttribute(loop_index);
+            AvatarAttribute loop_index = new AvatarAttribute("loop_index", AvatarType.INTEGER, block, null);
+            block.addAttribute(loop_index);
 
             for (TMLAttribute attr : task.getAttributes()) {
                 AvatarType type;