diff --git a/Makefile b/Makefile
index 1263dd6820041412acedb39efd1fba9dd65efb60..e9ef46e23d2fa2b5ede73fc9f09eac1a966c4572 100755
--- a/Makefile
+++ b/Makefile
@@ -300,7 +300,7 @@ stdrelease:
 	cp $(TTOOL_DOC)/README_proverif $(TTOOL_TARGET)/proverif
 # Graphs
 	mkdir -p $(TTOOL_TARGET)/graphs
-	cp $(TTOOL_DOC)/README_graph $(TTOOL_TARGET)/graph
+	cp $(TTOOL_DOC)/README_graph $(TTOOL_TARGET)/graphs/
 # Figure
 	mkdir -p $(TTOOL_TARGET)/figures
 	cp $(TTOOL_DOC)/README_figure $(TTOOL_TARGET)/figures
@@ -426,8 +426,8 @@ define functionCommonPreinstall
 	mkdir -p $(1)/TTool/graphs
 	cp $(TTOOL_DOC)/README_graph $(1)/TTool/graphs
 # Figure
-	mkdir -p $(1)/TTool/figure
-	cp $(TTOOL_DOC)/README_figure $(1)/TTool/figure
+	mkdir -p $(1)/TTool/figures
+	cp $(TTOOL_DOC)/README_figure $(1)/TTool/figures
 # VCD
 	mkdir -p $(1)/TTool/vcd
 	cp $(TTOOL_DOC)/README_vcd $(1)/TTool/vcd
diff --git a/bin/config.xml b/bin/config.xml
index b985a70af7a27a70211c1c01158b8fb53078174b..d3d6c5cd16fb90cd74d1aa58869bb67a99c54e21 100755
--- a/bin/config.xml
+++ b/bin/config.xml
@@ -18,7 +18,7 @@
 <CaesarOpenPath data="/packages/cadp/com/caesar.open" />
 <FILEPath data="../modeling" />
 <LIBPath data="../lib" />
-<IMGPath data="../figure" />
+<IMGPath data="../figures" />
 <LOTOSPath data="../lotos" />
 <GGraphPath data="../graphs" />
 <TGraphPath data="../graphs" />
@@ -71,4 +71,4 @@
 
 
 <ProVerifHash data=""/>
-</TURTLECONFIGURATION>
\ No newline at end of file
+</TURTLECONFIGURATION>
diff --git a/doc/config_linux.xml b/doc/config_linux.xml
index 8719d08d7fb1b0423c0c81406bdb2df61af61b4a..7bd465be9516ded7d0d2875b52d8e43072373f30 100755
--- a/doc/config_linux.xml
+++ b/doc/config_linux.xml
@@ -5,7 +5,7 @@
 <DOTTYHost data="localhost" />
 <FILEPath data="../modeling/" />
 <LIBPath data="../lib" />
-<IMGPath data="../figure" />
+<IMGPath data="../figures" />
 <LOTOSPath data="../lotos/" />
 <GGraphPath data="../graphs" />
 <TGraphPath data="../graphs" />
diff --git a/doc/config_macosx.xml b/doc/config_macosx.xml
index 367f350dd69fc613d63115779876bbb4f79afa1b..5f17e22a9ea9b2ff51ee361154f3eed756ace302 100755
--- a/doc/config_macosx.xml
+++ b/doc/config_macosx.xml
@@ -5,7 +5,7 @@
 <DOTTYHost data="localhost" />
 <FILEPath data="../modeling/" />
 <LIBPath data="../lib" />
-<IMGPath data="../figure" />
+<IMGPath data="../figures" />
 <LOTOSPath data="../lotos/" />
 <GGraphPath data="../graphs" />
 <TGraphPath data="../graphs" />
diff --git a/doc/config_windows.xml b/doc/config_windows.xml
index 10c0e6dbe0aa7dac47656423c07a706a8341dfd4..a05f8eae43211852510a764b436a63dc13faa85a 100755
--- a/doc/config_windows.xml
+++ b/doc/config_windows.xml
@@ -5,7 +5,7 @@
 <DOTTYHost data="localhost" />
 <FILEPath data="../modeling/" />
 <LIBPath data="../lib" />
-<IMGPath data="../figure" />
+<IMGPath data="../figures" />
 <LOTOSPath data="../lotos/" />
 <GGraphPath data="../graphs" />
 <TGraphPath data="../graphs" />
diff --git a/src/Test.java b/src/Test.java
index 72b732be97bb4e89c626a82acdbd3a2f2ab4642b..58854a4537d3ca0926c0e9ba819348697535ad13 100755
--- a/src/Test.java
+++ b/src/Test.java
@@ -108,6 +108,7 @@ public class Test  {
 	nbOfPb += evalBoolInt("(1+2)==3", true, false);
 	nbOfPb += evalBoolInt("3==1+2", true, false);
     	nbOfPb += evalBoolInt("1+2==3", true, false);
+	//nbOfPb += evalBoolInt("1+2==3", true, false);
     	
     	System.out.println("Nb of problems found:" + nbOfPb);
 	
diff --git a/src/myutil/BoolExpressionEvaluator.java b/src/myutil/BoolExpressionEvaluator.java
index a90f47e773a7acbc8b9737a4130b2be3d65fdcb6..6c916c9421afb87eab2ae25c11ad9df1f8a9a56b 100755
--- a/src/myutil/BoolExpressionEvaluator.java
+++ b/src/myutil/BoolExpressionEvaluator.java
@@ -200,7 +200,7 @@ public class BoolExpressionEvaluator {
 		     this.right = newE;
 		     return newE;
 		} else {
-		    // We must find the father where to ad the operator
+		    // We must find the father where to add the operator
 		    // We thus look for the first father with no binary operator
 		    // or with a binary operator that has a higher priority
 		    IntBoolRes targetF = this.father;
@@ -209,11 +209,12 @@ public class BoolExpressionEvaluator {
 		    while(go == true) {
 			if (targetF == null) {
 			    go = false;
-			}
-			if (!(targetF.isABinaryOperator())) {
-			    go = false;
-			} else if (targetF.hasAHigherPriorityThan(newE)) {
-			    targetF = targetF.father;
+			} else {
+			    if (!(targetF.isABinaryOperator())) {
+				go = false;
+			    } else if (targetF.hasAHigherPriorityThan(newE)) {
+				targetF = targetF.father;
+			    }
 			}
 		    }
 
@@ -221,12 +222,20 @@ public class BoolExpressionEvaluator {
 			newE.left = top;
 			top = newE;
 			return top;
+		    } else {
+			if (targetF.isABinaryOperator()) {
+			    newE.right = targetF.left;
+			    targetF.left = newE;
+			    return newE;
+			} else {
+			    newE.right = targetF.right;
+			    targetF.right = newE;
+			    return newE;
+			}
+			
 		    }
 
 		    
-		    
-		    
-		    
 		}
 		
                 
@@ -234,7 +243,7 @@ public class BoolExpressionEvaluator {
 
 
             // Element added at the root of the current
-            // If the current has not type ..
+            // If the current has no type ..
             if (!isAvailable()) {
                 return null;
             }