diff --git a/src/remotesimulation/CommandParser.java b/src/remotesimulation/CommandParser.java
index 41aba9453942e772e9fbb56b18fdb95a79067f4d..948aae866ab95f5f117018b782edc86d27b307c8 100755
--- a/src/remotesimulation/CommandParser.java
+++ b/src/remotesimulation/CommandParser.java
@@ -199,8 +199,8 @@ public class CommandParser {
 		// get-command-and-task
 		params = new int[1];
 		paramNames = new String[1];
-		params[0] = 1;
-		paramNames[0] = "Task id";
+		params[0] = 0;
+		paramNames[0] = "Task id (or \"all\")";
 		sc = new SimulationCommand("get-command-of-task", "gcot", "14", params, paramNames, "Returns the current command of the task provided as argument");
 		commandList.add(sc);
 		
diff --git a/src/ui/JToolBarMainTurtle.java b/src/ui/JToolBarMainTurtle.java
index 19a0c8743dfdb9ce893b47a6563608a6d913e5af..d794469117a7bd42ef8db4aa3142e17781ff3168 100755
--- a/src/ui/JToolBarMainTurtle.java
+++ b/src/ui/JToolBarMainTurtle.java
@@ -172,6 +172,21 @@ public	class JToolBarMainTurtle extends JToolBar	{
 		}
         
         addSeparator();
+		
+		if (MainGUI.systemcOn) {
+            button = add(mgui.actions[TGUIAction.ACT_GEN_SYSTEMC]);
+            button.addMouseListener(mgui.mouseHandler);
+			
+			button = add(mgui.actions[TGUIAction.ACT_SIMU_SYSTEMC]);
+            button.addMouseListener(mgui.mouseHandler);
+            addSeparator();
+			
+			button = add(mgui.actions[TGUIAction.ACT_GEN_TMLTXT]);
+            button.addMouseListener(mgui.mouseHandler);
+            addSeparator();
+        }
+		
+		addSeparator();
         
         button = add(mgui.actions[TGUIAction.ACT_GEN_JAVA]);
         button.addMouseListener(mgui.mouseHandler);
@@ -187,19 +202,6 @@ public	class JToolBarMainTurtle extends JToolBar	{
         
         addSeparator();
 		
-        if (MainGUI.systemcOn) {
-            button = add(mgui.actions[TGUIAction.ACT_GEN_SYSTEMC]);
-            button.addMouseListener(mgui.mouseHandler);
-			
-			button = add(mgui.actions[TGUIAction.ACT_SIMU_SYSTEMC]);
-            button.addMouseListener(mgui.mouseHandler);
-            addSeparator();
-			
-			button = add(mgui.actions[TGUIAction.ACT_GEN_TMLTXT]);
-            button.addMouseListener(mgui.mouseHandler);
-            addSeparator();
-        }
-		
         
         if ((ConfigurationTTool.ExternalCommand1.length() > 0) && (ConfigurationTTool.ExternalCommand1Host.length() > 0)) {
 			button = add(mgui.actions[TGUIAction.EXTERNAL_ACTION_1]);
diff --git a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
index d9c15a30257283bde0254d8537a2b2e9f5375fe5..8007c8352d6425f8e3c7837f2686edf4ccb68968 100755
--- a/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
+++ b/src/ui/interactivesimulation/JFrameInteractiveSimulation.java
@@ -1329,9 +1329,11 @@ public	class JFrameInteractiveSimulation extends JFrame implements ActionListene
 			return;
 		}
 		
-		for(TMLTask task: tmap.getTMLModeling().getTasks()) {
+		sendCommand("get-command-of-task all"); 
+		
+		/*for(TMLTask task: tmap.getTMLModeling().getTasks()) {
 			sendCommand("get-command-of-task " + task.getID()); 
-		}
+		}*/
 	}
 	
 	private void updateRunningCommand(String id, String command) {