diff --git a/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java b/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
index 98fe7a7cb62ddf54bcebe6895d2e38423112e930..8b064420be0e53be31327fdd24d8f5da881cd0c0 100755
--- a/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
+++ b/src/main/java/ui/avatarinteractivesimulation/JFrameAvatarInteractiveSimulation.java
@@ -1848,11 +1848,11 @@ public  class JFrameAvatarInteractiveSimulation extends JFrame implements Avatar
             return;
         }
 
-        newSVGSave(fileName);
+        newSVGSave("NEW" + fileName);
 
 
 
-      /*  StringBuffer sb = new StringBuffer("<?xml version=\"1.0\" standalone=\"no\"?>\n");
+      StringBuffer sb = new StringBuffer("<?xml version=\"1.0\" standalone=\"no\"?>\n");
         sb.append("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
         sb.append("<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">\n");
 
@@ -1887,7 +1887,7 @@ public  class JFrameAvatarInteractiveSimulation extends JFrame implements Avatar
 
         //TraceManager.addDev("Svg=" + sb.toString());
 
-        //return sb.toString();*/
+        //return sb.toString();
 
     }
 
diff --git a/src/main/java/ui/window/JDialogSelectSystemCAMSBlock.java b/src/main/java/ui/window/JDialogSelectSystemCAMSBlock.java
index 6601f4b62bd1f2f0d9431d31d7a1cdca126fc0dc..093e21dd964de36b208f18cef09aaa9a4fed2618 100755
--- a/src/main/java/ui/window/JDialogSelectSystemCAMSBlock.java
+++ b/src/main/java/ui/window/JDialogSelectSystemCAMSBlock.java
@@ -291,12 +291,15 @@ public class JDialogSelectSystemCAMSBlock extends JDialogBase implements ActionL
     public void actionPerformed( ActionEvent evt )  {
         String command = evt.getActionCommand();
 
-        // Compare the action command to the known actions.
-        if (command.equals("Start Syntax Analysis"))  {
+        if (evt.getSource() == closeButton) {
             closeDialog();
-        } else if (command.equals("Cancel")) {
+            return;
+        } else if (evt.getSource() == cancelButton) {
             cancelDialog();
-        } else if (command.equals("addOneIgnored")) {
+            return;
+        }
+        // Compare the action command to the known actions.
+       if (command.equals("addOneIgnored")) {
             addOneIgnored();
         } else if (command.equals("addOneValidated")) {
             addOneValidated();
diff --git a/src/main/java/ui/window/JDialogSelectTMLComponent.java b/src/main/java/ui/window/JDialogSelectTMLComponent.java
index ab82329086eb9b3d7dd874e145b3aa756539f727..52117c43b071cd1e593dba399313d56eca4e43e9 100755
--- a/src/main/java/ui/window/JDialogSelectTMLComponent.java
+++ b/src/main/java/ui/window/JDialogSelectTMLComponent.java
@@ -298,12 +298,16 @@ public class JDialogSelectTMLComponent extends JDialogBase implements ActionList
     public void actionPerformed(ActionEvent evt) {
         String command = evt.getActionCommand();
 
-        // Compare the action command to the known actions.
-        if (command.equals("Start Syntax Analysis")) {
+        if (evt.getSource() == closeButton) {
             closeDialog();
-        } else if (command.equals("Cancel")) {
+            return;
+        } else if (evt.getSource() == cancelButton) {
             cancelDialog();
-        } else if (command.equals("addOneIgnored")) {
+            return;
+        }
+
+        // Compare the action command to the known actions.
+       if (command.equals("addOneIgnored")) {
             addOneIgnored();
         } else if (command.equals("addOneValidated")) {
             addOneValidated();
diff --git a/src/main/java/ui/window/JDialogSelectTMLNodes.java b/src/main/java/ui/window/JDialogSelectTMLNodes.java
index 24109e7dc9dae543e6f39199362f6997398c0fa8..7d03fa5439b69e5df421be062ef604cefe282838 100755
--- a/src/main/java/ui/window/JDialogSelectTMLNodes.java
+++ b/src/main/java/ui/window/JDialogSelectTMLNodes.java
@@ -300,12 +300,16 @@ public class JDialogSelectTMLNodes extends JDialogBase implements ActionListener
     public void actionPerformed(ActionEvent evt) {
         String command = evt.getActionCommand();
 
-        // Compare the action command to the known actions.
-        if (command.equals("Start Syntax Analysis")) {
+        if (evt.getSource() == closeButton) {
             closeDialog();
-        } else if (command.equals("Cancel")) {
+            return;
+        } else if (evt.getSource() == cancelButton) {
             cancelDialog();
-        } else if (command.equals("addOneIgnored")) {
+            return;
+        }
+
+        // Compare the action command to the known actions.
+        if (command.equals("addOneIgnored")) {
             addOneIgnored();
         } else if (command.equals("addOneValidated")) {
             addOneValidated();