diff --git a/Makefile.old b/Makefile.old
index af4f3c61..ea3348e4 100644
--- a/Makefile.old
+++ b/Makefile.old
@@ -10,6 +10,9 @@ PHREEQC=../src/Class_release_64/phreeqc
 #PHREEQC=../../optimize_model/src/Class_release_64/phreeqc
 #PHREEQC=../src/Class_debug_64/phreeqcpp
 
+#VALGRIND=valgrind --leak-check=full
+VALGRIND=
+
 ifeq ($(CFG), CYGWIN)
    PHREEQC=/cygdrive/c/Programs/phreeqc3-trunk/Class_release/phreeqcpp.exe
    #PHREEQC=/cygdrive/c/Programs/phreeqc3-trunk/Class_debug/phreeqcpp.exe
@@ -21,100 +24,101 @@ all: ex1.out ex2.out ex2b.out ex3.out ex4.out ex5.out ex6.out ex7.out ex8.out ex
 	ex19.out ex19b.out ex20a.out ex20b.out ex21.out ex22.out
 
 ex1.out: $(INPUT)/ex1 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex1 ex1.out $(PHREEQCDAT)  ex1.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex1 ex1.out $(PHREEQCDAT)  ex1.log
 
 ex2.out: $(INPUT)/ex2 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex2 ex2.out $(PHREEQCDAT)  ex2.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex2 ex2.out $(PHREEQCDAT)  ex2.log
 
 ex2b.out: $(INPUT)/ex2b $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex2b ex2b.out $(PHREEQCDAT)  ex2b.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex2b ex2b.out $(PHREEQCDAT)  ex2b.log
 
 ex3.out: $(INPUT)/ex3 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex3 ex3.out $(PHREEQCDAT)  ex3.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex3 ex3.out $(PHREEQCDAT)  ex3.log
 
 ex4.out: $(INPUT)/ex4 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex4 ex4.out $(PHREEQCDAT)  ex4.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex4 ex4.out $(PHREEQCDAT)  ex4.log
 
 ex5.out: $(INPUT)/ex5 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex5 ex5.out $(PHREEQCDAT)  ex5.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex5 ex5.out $(PHREEQCDAT)  ex5.log
 
 ex6.out: $(INPUT)/ex6 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex6 ex6.out $(PHREEQCDAT)  ex6.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex6 ex6.out $(PHREEQCDAT)  ex6.log
 
 ex7.out: $(INPUT)/ex7 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex7 ex7.out $(PHREEQCDAT)  ex7.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex7 ex7.out $(PHREEQCDAT)  ex7.log
 
 ex8.out: $(INPUT)/ex8 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex8 ex8.out $(PHREEQCDAT)  ex8.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex8 ex8.out $(PHREEQCDAT)  ex8.log
 
 ex9.out: $(INPUT)/ex9 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex9 ex9.out $(PHREEQCDAT)  ex9.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex9 ex9.out $(PHREEQCDAT)  ex9.log
 
 ex10.out: $(INPUT)/ex10 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex10 ex10.out $(PHREEQCDAT)  ex10.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex10 ex10.out $(PHREEQCDAT)  ex10.log
 
 ex11.out: $(INPUT)/ex11 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex11 ex11.out $(PHREEQCDAT)  ex11.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex11 ex11.out $(PHREEQCDAT)  ex11.log
 
 ex12.out: $(INPUT)/ex12 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex12 ex12.out $(PHREEQCDAT)  ex12.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex12 ex12.out $(PHREEQCDAT)  ex12.log
 
 ex12a.out: $(INPUT)/ex12a $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex12a ex12a.out $(PHREEQCDAT)  ex12a.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex12a ex12a.out $(PHREEQCDAT)  ex12a.log
 
 ex13a.out: $(INPUT)/ex13a $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex13a ex13a.out $(PHREEQCDAT)  ex13a.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex13a ex13a.out $(PHREEQCDAT)  ex13a.log
 
 ex13b.out: $(INPUT)/ex13b $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex13b ex13b.out $(PHREEQCDAT)  ex13b.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex13b ex13b.out $(PHREEQCDAT)  ex13b.log
 
 ex13c.out: $(INPUT)/ex13c $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex13c ex13c.out $(PHREEQCDAT)  ex13c.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex13c ex13c.out $(PHREEQCDAT)  ex13c.log
 
 ex13ac.out: $(INPUT)/ex13ac $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex13ac ex13ac.out $(PHREEQCDAT)  ex13ac.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex13ac ex13ac.out $(PHREEQCDAT)  ex13ac.log
 
 ex14.out: $(INPUT)/ex14 $(PHREEQC) $(WATEQ4FDAT)
-	$(PHREEQC) $(INPUT)/ex14 ex14.out $(PHREEQCDAT)  ex14.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex14 ex14.out $(PHREEQCDAT)  ex14.log
 
 ex15.out: $(INPUT)/ex15 $(PHREEQC) $(INPUT)/ex15.dat
-	$(PHREEQC) $(INPUT)/ex15 ex15.out $(INPUT)/ex15.dat  ex15.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex15 ex15.out $(INPUT)/ex15.dat  ex15.log
 
 ex15a.out: $(INPUT)/ex15 $(PHREEQC) $(INPUT)/ex15.dat
-	$(PHREEQC) $(INPUT)/ex15a ex15a.out $(INPUT)/ex15.dat  ex15a.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex15a ex15a.out $(INPUT)/ex15.dat  ex15a.log
 
 ex15b.out: $(INPUT)/ex15b $(PHREEQC) $(INPUT)/ex15.dat
-	$(PHREEQC) $(INPUT)/ex15b ex15b.out $(INPUT)/ex15.dat  ex15b.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex15b ex15b.out $(INPUT)/ex15.dat  ex15b.log
 
 ex16.out: $(INPUT)/ex16 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex16 ex16.out $(PHREEQCDAT)  ex16.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex16 ex16.out $(PHREEQCDAT)  ex16.log
 
 ex17.out: $(INPUT)/ex17 $(PHREEQC) $(PITZERDAT)
-	$(PHREEQC) $(INPUT)/ex17 ex17.out $(PITZERDAT)  ex17.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex17 ex17.out $(PITZERDAT)  ex17.log
 
 ex17b.out: $(INPUT)/ex17b $(PHREEQC) $(PITZERDAT)
-	$(PHREEQC) $(INPUT)/ex17b ex17b.out $(PITZERDAT)  ex17b.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex17b ex17b.out $(PITZERDAT)  ex17b.log
 
 ex18.out: $(INPUT)/ex18 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex18 ex18.out $(PHREEQCDAT)  ex18.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex18 ex18.out $(PHREEQCDAT)  ex18.log
 	
 ex19.out: $(INPUT)/ex19 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex19 ex19.out $(PHREEQCDAT)  ex19.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex19 ex19.out $(PHREEQCDAT)  ex19.log
 
 ex19b.out: $(INPUT)/ex19b $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex19b ex19b.out $(PHREEQCDAT)  ex19b.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex19b ex19b.out $(PHREEQCDAT)  ex19b.log
 	
 ex20a.out: $(INPUT)/ex20a $(PHREEQC) $(ISODAT) 
-	$(PHREEQC) $(INPUT)/ex20a ex20a.out $(ISODAT) ex20a.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex20a ex20a.out $(ISODAT) ex20a.log
 
 ex20b.out: $(INPUT)/ex20b $(PHREEQC) $(ISODAT)
-	$(PHREEQC) $(INPUT)/ex20b ex20b.out $(ISODAT) ex20b.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex20b ex20b.out $(ISODAT) ex20b.log
 
 ex21.out: $(INPUT)/ex21 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex21 ex21.out $(PHREEQCDAT)   ex21.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex21 ex21.out $(PHREEQCDAT)   ex21.log
 
 ex22.out: $(INPUT)/ex22 $(PHREEQC) $(PHREEQCDAT)
-	$(PHREEQC) $(INPUT)/ex22 ex22.out $(PHREEQCDAT)  ex22.log
+	$(VALGRIND) $(PHREEQC) $(INPUT)/ex22 ex22.out $(PHREEQCDAT)  ex22.log
+
 diff:
 	svn diff --diff-cmd diff -x -bw	
 
diff --git a/ex10.out b/ex10.out
index 95664a90..a86dd7c7 100644
--- a/ex10.out
+++ b/ex10.out
@@ -8417,6 +8417,6 @@ Misc 1:                  4.8032e-03
 Misc 2:                  8.5786e-01 
 
 ------------------------------
-End of Run after 0.39 Seconds.
+End of Run after 0.38 Seconds.
 ------------------------------
 
diff --git a/ex11.out b/ex11.out
index 344c01d0..ed63ec9d 100644
--- a/ex11.out
+++ b/ex11.out
@@ -211,7 +211,7 @@ Reading input data for simulation 3.
 	 reset false
 WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 40.
 WARNING: Dispersivities were read for 1 cells. Last value is used till cell 40.
-------------------------------
-End of Run after 4.16 Seconds.
-------------------------------
+-----------------------------
+End of Run after 4.1 Seconds.
+-----------------------------
 
diff --git a/ex12.out b/ex12.out
index 7912488d..e63d02c4 100644
--- a/ex12.out
+++ b/ex12.out
@@ -52,7 +52,7 @@ Reading input data for simulation 1.
 	   reset   false
 WARNING: Cell-lengths were read for 1 cells. Last value is used till cell 60.
 WARNING: Dispersivities were read for 1 cells. Last value is used till cell 60.
-------------------------------
-End of Run after 1.52 Seconds.
-------------------------------
+-----------------------------
+End of Run after 1.5 Seconds.
+-----------------------------
 
diff --git a/ex12a.out b/ex12a.out
index 262378f6..459032f6 100644
--- a/ex12a.out
+++ b/ex12a.out
@@ -164,7 +164,7 @@ WARNING: No dispersivities were read; disp = 0 assumed.
   7.5000e+00   1.0547e-05   1.2626e-06  -3.9008e-08  -2.6645e-09 
   8.5000e+00   3.8231e-06   2.9867e-07  -2.2212e-09  -8.8983e-11 
 
-------------------------------
-End of Run after 1.34 Seconds.
-------------------------------
+-----------------------------
+End of Run after 1.3 Seconds.
+-----------------------------
 
diff --git a/ex13ac.out b/ex13ac.out
index 479cf446..480d9903 100644
--- a/ex13ac.out
+++ b/ex13ac.out
@@ -847,7 +847,7 @@ WARNING: Dispersivities were read for 1 cells. Last value is used till cell 20.
 	  30 plot_xy dist, TOT("Cl")*1000, color = Green, symbol = Plus
 	  -end
 	END
-------------------------------
-End of Run after 0.61 Seconds.
-------------------------------
+-----------------------------
+End of Run after 0.6 Seconds.
+-----------------------------
 
diff --git a/ex13c.out b/ex13c.out
index a23fa3e8..e651930a 100644
--- a/ex13c.out
+++ b/ex13c.out
@@ -776,7 +776,7 @@ WARNING: Dispersivities were read for 1 cells. Last value is used till cell 20.
 	  20 GRAPH_Y TOT("Na")*1000 TOT("Cl")*1000
 	    -end
 	END
-------------------------------
-End of Run after 0.41 Seconds.
-------------------------------
+-----------------------------
+End of Run after 0.4 Seconds.
+-----------------------------
 
diff --git a/ex15.out b/ex15.out
index 94228424..24318ab4 100644
--- a/ex15.out
+++ b/ex15.out
@@ -213,6 +213,6 @@ WARNING: USER_PUNCH: Headings count does not match number of calls to PUNCH.
 	        shifts               110
 	END
 -------------------------------
-End of Run after 11.93 Seconds.
+End of Run after 11.74 Seconds.
 -------------------------------
 
diff --git a/ex15a.out b/ex15a.out
index 42ebfe9f..cedd0a54 100644
--- a/ex15a.out
+++ b/ex15a.out
@@ -190,6 +190,6 @@ WARNING: USER_PUNCH: Headings count does not match number of calls to PUNCH.
 	        shifts               110
 	END
 -------------------------------
-End of Run after 11.94 Seconds.
+End of Run after 11.73 Seconds.
 -------------------------------
 
diff --git a/ex15b.out b/ex15b.out
index 175b2bda..49abce6e 100644
--- a/ex15b.out
+++ b/ex15b.out
@@ -187,6 +187,6 @@ WARNING: Dispersivities were read for 1 cells. Last value is used till cell 20.
 	        shifts               110
 	END
 -------------------------------
-End of Run after 12.03 Seconds.
+End of Run after 11.74 Seconds.
 -------------------------------
 
diff --git a/ex16.out b/ex16.out
index 590aa286..0ef5bd60 100644
--- a/ex16.out
+++ b/ex16.out
@@ -442,6 +442,6 @@ Reading input data for simulation 2.
 ------------------------------------
 
 ------------------------------
-End of Run after 0.03 Seconds.
+End of Run after 0.04 Seconds.
 ------------------------------
 
diff --git a/ex17.out b/ex17.out
index 358c67df..96a1f079 100644
--- a/ex17.out
+++ b/ex17.out
@@ -360,6 +360,6 @@ Reading input data for simulation 2.
 ------------------------------------
 
 ------------------------------
-End of Run after 0.02 Seconds.
+End of Run after 0.03 Seconds.
 ------------------------------
 
diff --git a/ex17b.out b/ex17b.out
index 9eed4481..ea3e408e 100644
--- a/ex17b.out
+++ b/ex17b.out
@@ -3728,6 +3728,6 @@ Reading input data for simulation 2.
 ------------------------------------
 
 ------------------------------
-End of Run after 0.24 Seconds.
+End of Run after 0.26 Seconds.
 ------------------------------
 
diff --git a/ex19.out b/ex19.out
index f5aa68b4..fa1d2877 100644
--- a/ex19.out
+++ b/ex19.out
@@ -69,6 +69,6 @@ Reading input data for simulation 1.
 	PRINT
 	     reset false
 ------------------------------
-End of Run after 0.02 Seconds.
+End of Run after 0.03 Seconds.
 ------------------------------
 
diff --git a/ex2.out b/ex2.out
index 5fd7dafc..44ca7e71 100644
--- a/ex2.out
+++ b/ex2.out
@@ -4354,6 +4354,6 @@ Reading input data for simulation 2.
 ------------------------------------
 
 ------------------------------
-End of Run after 0.04 Seconds.
+End of Run after 0.05 Seconds.
 ------------------------------
 
diff --git a/ex20b.out b/ex20b.out
index 1f0d3e8f..2536e480 100644
--- a/ex20b.out
+++ b/ex20b.out
@@ -53631,6 +53631,6 @@ Reading input data for simulation 114.
 --------------------------------------
 
 ------------------------------
-End of Run after 1.33 Seconds.
+End of Run after 1.34 Seconds.
 ------------------------------
 
diff --git a/ex21.out b/ex21.out
index 32d925a5..fc14bc0f 100644
--- a/ex21.out
+++ b/ex21.out
@@ -961,6 +961,6 @@ WARNING: No dispersivities were read; disp = 0 assumed.
 	END	
 	END
 -------------------------------
-End of Run after 19.28 Seconds.
+End of Run after 19.26 Seconds.
 -------------------------------
 
diff --git a/ex3.out b/ex3.out
index 2e1aeb29..e7be435d 100644
--- a/ex3.out
+++ b/ex3.out
@@ -819,6 +819,6 @@ Reading input data for simulation 6.
 ------------------------------------
 
 ------------------------------
-End of Run after 0.01 Seconds.
+End of Run after 0.02 Seconds.
 ------------------------------
 
diff --git a/ex4.out b/ex4.out
index e2c711a5..c31d527f 100644
--- a/ex4.out
+++ b/ex4.out
@@ -490,6 +490,6 @@ Reading input data for simulation 3.
 ------------------------------------
 
 ------------------------------
-End of Run after 0.01 Seconds.
+End of Run after 0.02 Seconds.
 ------------------------------
 
diff --git a/ex6.out b/ex6.out
index 19d2096c..25cffff4 100644
--- a/ex6.out
+++ b/ex6.out
@@ -3882,7 +3882,7 @@ End of simulation.
 Reading input data for simulation 12.
 -------------------------------------
 
-------------------------------
-End of Run after 0.51 Seconds.
-------------------------------
+-----------------------------
+End of Run after 0.5 Seconds.
+-----------------------------
 
diff --git a/ex7.out b/ex7.out
index d3c3b95a..08e2460e 100644
--- a/ex7.out
+++ b/ex7.out
@@ -3135,6 +3135,6 @@ Reading input data for simulation 4.
 ------------------------------------
 
 ------------------------------
-End of Run after 0.04 Seconds.
+End of Run after 0.05 Seconds.
 ------------------------------
 
diff --git a/ex8.out b/ex8.out
index b6b84c4b..88ddfa62 100644
--- a/ex8.out
+++ b/ex8.out
@@ -3880,6 +3880,6 @@ Reading input data for simulation 34.
 -------------------------------------
 
 ------------------------------
-End of Run after 0.04 Seconds.
+End of Run after 0.06 Seconds.
 ------------------------------