diff --git a/packages/CLPBN/clpbn/bp/TODO b/packages/CLPBN/clpbn/bp/TODO
index 9001fdd32..60eb32466 100644
--- a/packages/CLPBN/clpbn/bp/TODO
+++ b/packages/CLPBN/clpbn/bp/TODO
@@ -5,6 +5,4 @@
 - Consider using hashs instead of vectors of colors to calculate the groups in
   counting bp
 - use more psize_t instead of unsigned for looping through params
-- use more Util::abort and Util::vectorIndex
-
 
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/city/gen_city.sh b/packages/CLPBN/clpbn/bp/benchmarks/city/gen_city.sh
index 814707d93..7c95f4ed3 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/city/gen_city.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/city/gen_city.sh
@@ -1,4 +1,4 @@
-#! /home/tiago/bin/yap -L --
+#! /home/tgomes/bin/yap -L --
 
 
 :- initialization(main).
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/bp_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/bp_tests.sh
index 58666fc33..4cabcb531 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/bp_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/bp_tests.sh
@@ -8,13 +8,13 @@ SOLVER="bp"
 function run_all_graphs
 {
   write_header $1
-  run_solver p1000w$N_WORKSHOPS     $2
-  run_solver p5000w$N_WORKSHOPS     $2
-  run_solver p10000w$N_WORKSHOPS    $2
-  run_solver p20000w$N_WORKSHOPS    $2
-  run_solver p30000w$N_WORKSHOPS    $2
-  run_solver p40000w$N_WORKSHOPS    $2
-  run_solver p50000w$N_WORKSHOPS    $2
+  run_solver p1000w$N_WORKSHOPS   $2
+  run_solver p5000w$N_WORKSHOPS   $2
+  run_solver p10000w$N_WORKSHOPS  $2
+  run_solver p20000w$N_WORKSHOPS  $2
+  run_solver p30000w$N_WORKSHOPS  $2
+  run_solver p40000w$N_WORKSHOPS  $2
+  run_solver p50000w$N_WORKSHOPS  $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/cbp_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/cbp_tests.sh
index 9814d8257..01b620c83 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/cbp_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/cbp_tests.sh
@@ -8,13 +8,13 @@ SOLVER="cbp"
 function run_all_graphs
 {
   write_header $1
-  run_solver p1000w$N_WORKSHOPS     $2
-  run_solver p5000w$N_WORKSHOPS     $2
-  run_solver p10000w$N_WORKSHOPS    $2
-  run_solver p20000w$N_WORKSHOPS    $2
-  run_solver p30000w$N_WORKSHOPS    $2
-  run_solver p40000w$N_WORKSHOPS    $2
-  run_solver p50000w$N_WORKSHOPS    $2
+  run_solver p1000w$N_WORKSHOPS   $2
+  run_solver p5000w$N_WORKSHOPS   $2
+  run_solver p10000w$N_WORKSHOPS  $2
+  run_solver p20000w$N_WORKSHOPS  $2
+  run_solver p30000w$N_WORKSHOPS  $2
+  run_solver p40000w$N_WORKSHOPS  $2
+  run_solver p50000w$N_WORKSHOPS  $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/fove_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/fove_tests.sh
index 94fbf8009..f280f7814 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/fove_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/fove_tests.sh
@@ -8,13 +8,13 @@ SOLVER="fove"
 function run_all_graphs
 {
   write_header $1
-  run_solver p1000w$N_WORKSHOPS     $2
-  run_solver p5000w$N_WORKSHOPS     $2
-  run_solver p10000w$N_WORKSHOPS    $2
-  run_solver p20000w$N_WORKSHOPS    $2
-  run_solver p30000w$N_WORKSHOPS    $2
-  run_solver p40000w$N_WORKSHOPS    $2
-  run_solver p50000w$N_WORKSHOPS    $2
+  run_solver p1000w$N_WORKSHOPS   $2
+  run_solver p5000w$N_WORKSHOPS   $2
+  run_solver p10000w$N_WORKSHOPS  $2
+  run_solver p20000w$N_WORKSHOPS  $2
+  run_solver p30000w$N_WORKSHOPS  $2
+  run_solver p40000w$N_WORKSHOPS  $2
+  run_solver p50000w$N_WORKSHOPS  $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/hve_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/hve_tests.sh
index a44d7f28f..a0f2f3d34 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/hve_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/comp_workshops/hve_tests.sh
@@ -8,13 +8,13 @@ SOLVER="hve"
 function run_all_graphs
 {
   write_header $1
-  run_solver p1000w$N_WORKSHOPS     $2
-  run_solver p5000w$N_WORKSHOPS     $2
-  run_solver p10000w$N_WORKSHOPS    $2
-  run_solver p20000w$N_WORKSHOPS    $2
-  run_solver p30000w$N_WORKSHOPS    $2
-  run_solver p40000w$N_WORKSHOPS    $2
-  run_solver p50000w$N_WORKSHOPS    $2
+  run_solver p1000w$N_WORKSHOPS   $2
+  run_solver p5000w$N_WORKSHOPS   $2
+  run_solver p10000w$N_WORKSHOPS  $2
+  run_solver p20000w$N_WORKSHOPS  $2
+  run_solver p30000w$N_WORKSHOPS  $2
+  run_solver p40000w$N_WORKSHOPS  $2
+  run_solver p50000w$N_WORKSHOPS  $2
 }
 
 prepare_new_run
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/smokers/gen_people.sh b/packages/CLPBN/clpbn/bp/benchmarks/smokers/gen_people.sh
index 3a6e9cdee..b8eebbfa1 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/smokers/gen_people.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/smokers/gen_people.sh
@@ -1,4 +1,4 @@
-#!/home/tiago/bin/yap -L --
+#!/home/tgomes/bin/yap -L --
 
 
 :- initialization(main).
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/smokers/hve_tests.sh b/packages/CLPBN/clpbn/bp/benchmarks/smokers/hve_tests.sh
index ce67d86ff..179e80acd 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/smokers/hve_tests.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/smokers/hve_tests.sh
@@ -10,12 +10,15 @@ function run_all_graphs
   write_header $1
   run_solver pop25   $2
   run_solver pop50   $2
-  run_solver pop75   $2
-  run_solver pop100  $2
-  run_solver pop125  $2
-  run_solver pop150  $2
+  #run_solver pop75   $2
+  #run_solver pop100  $2
+  #run_solver pop125  $2
+  #run_solver pop150  $2
 }
 
 prepare_new_run
 run_all_graphs "hve(elim_heuristic=min_neighbors)     " min_neighbors
+#run_all_graphs "hve(elim_heuristic=min_weight)        " min_weight
+#run_all_graphs "hve(elim_heuristic=min_fill)          " min_fill
+#run_all_graphs "hve(elim_heuristic=weighted_min_fill) " weighted_min_fill
 
diff --git a/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/gen_attrs.sh b/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/gen_attrs.sh
index 3f005cbf3..f3e7a5212 100755
--- a/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/gen_attrs.sh
+++ b/packages/CLPBN/clpbn/bp/benchmarks/workshop_attrs/gen_attrs.sh
@@ -1,4 +1,4 @@
-#!/home/tiago/bin/yap -L --
+#!/home/tgomes/bin/yap -L --
 
 :- use_module(library(lists)).