diff --git a/Makefile.am b/Makefile.am
index eada72e..82502cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,11 +31,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-if VFC_CI
-AM_LDFLAGS=-lvfc_probes -lvfc_probes_f
-endif
-
-
 ACLOCAL_AMFLAGS = -I m4
 
 VERSION_MAJOR   = @VERSION_MAJOR@
@@ -58,6 +53,8 @@ test_qmckl_fo = tests/qmckl_f.o
 src_qmckl_f   = src/qmckl_f.f90
 src_qmckl_fo  = src/qmckl_f.o
 header_tests  = tests/chbrclf.h tests/n2.h
+qmckl_probes_src = src/qmckl_probes.h src/qmckl_probes.c src/qmckl_probes_f.f90
+
 
 fortrandir = $(datadir)/$(PACKAGE_NAME)/fortran/
 dist_fortran_DATA = $(qmckl_f)
@@ -65,7 +62,7 @@ dist_fortran_DATA = $(qmckl_f)
 AM_CPPFLAGS = -I$(srcdir)/src -I$(srcdir)/include
 
 lib_LTLIBRARIES = src/libqmckl.la
-src_libqmckl_la_SOURCES = $(qmckl_h) $(src_qmckl_f) $(C_FILES) $(F_FILES) $(H_PRIVATE_FUNC_FILES) $(H_PRIVATE_TYPE_FILES) $(header_tests)
+src_libqmckl_la_SOURCES = $(qmckl_h) $(src_qmckl_f) $(C_FILES) $(F_FILES) $(H_PRIVATE_FUNC_FILES) $(H_PRIVATE_TYPE_FILES) $(header_tests) $(qmckl_probes_src)
 
 export qmckl_f qmckl_h srcdir
 
@@ -96,6 +93,14 @@ $(src_qmckl_fo): $(src_qmckl_f)
 $(src_qmckl_f): $(srcdir)/$(qmckl_f)
 	cp $(srcdir)/$(qmckl_f) $(src_qmckl_f)
 
+src/qmckl_probes.c: $(srcdir)/tools/qmckl_probes.c
+	cp $(srcdir)/tools/qmckl_probes.c $(srcdir)/src/qmckl_probes.c
+
+src/qmckl_probes.h: $(srcdir)/tools/qmckl_probes.h
+	cp $(srcdir)/tools/qmckl_probes.h $(srcdir)/src/qmckl_probes.h
+
+src/qmckl_probes_f.f90:
+	cp $(srcdir)/tools/qmckl_probes_f.f90 $(srcdir)/src/qmckl_probes_f.f90
 
 share/doc/qmckl/html/index.html: share/doc/qmckl/html/README.html
 	$(ln_s_verbose)cd share/doc/qmckl/html/ && \
@@ -115,14 +120,13 @@ dist_src_DATA = $(ORG_FILES) $(TANGLED_FILES) $(EXPORTED_FILES)
 
 BUILT_SOURCES = $(C_FILES) $(F_FILES) $(FH_FUNC_FILES) $(FH_TYPE_FILES) $(H_FUNC_FILES) $(H_TYPE_FILES) $(H_PRIVATE_FUNC_FILES) $(H_PRIVATE_TYPE_FILES) $(qmckl_f) $(qmckl_h) $(header_tests)
 
-CLEANFILES += $(BUILT_SOURCES) $(C_TEST_FILES) $(F_TEST_FILES) $(TANGLED_FILES) $(C_TEST_FILES) $(F_TEST_FILES) $(qmckl_f) $(qmckl_h) $(HTML_FILES) $(TEXT_FILES) share/doc/qmckl/html/index.html $(EXPORTED_FILES) $(header_tests) $(qmckl_probes_src) $(qmckl_probes_o) qmckl_probes_f.mod
+CLEANFILES += $(BUILT_SOURCES) $(C_TEST_FILES) $(F_TEST_FILES) $(TANGLED_FILES) $(C_TEST_FILES) $(F_TEST_FILES) $(qmckl_f) $(qmckl_h) $(HTML_FILES) $(TEXT_FILES) share/doc/qmckl/html/index.html $(EXPORTED_FILES) $(header_tests) qmckl_probes_f.mod
 
 EXTRA_DIST +=                 \
     tools/build_doc.sh        \
     tools/build_makefile.py   \
     tools/build_qmckl_f.sh    \
     tools/build_qmckl_h.sh    \
-    tools/build_qmckl_probes.sh\
     tools/config_doc.el       \
     tools/config_tangle.el    \
     tools/init.el             \
@@ -151,27 +155,14 @@ cat_h_verbose_0 = @echo "  HEADER   $@";
 ## Rules
 ## =====
 
-qmckl_probes_src = src/qmckl_probes.h qmckl_probes.c qmckl_probes_f.f90
-qmckl_probes_o = src/qmckl_probes.o qmckl_probes_f.o
-
 SUFFIXES = .f90 .h .org .c _f.f90 _func.h _type.h _private_func.h _private_type.h
-src_libqmckl_la_SOURCES += src/qmckl_probes.h src/qmckl_probes.c src/qmckl_probes_f.f90
 
 $(qmckl_h): $(H_FUNC_FILES) $(H_TYPE_FILES)
+	$(cat_h_verbose)$(srcdir)/tools/build_qmckl_h.sh
 
 $(qmckl_f): $(FH_FUNC_FILES) $(FH_TYPE_FILES)
 	$(cat_h_verbose)$(srcdir)/tools/build_qmckl_f.sh
 
-
-src/qmckl_probes.c: $(srcdir)/tools/qmckl_probes.c
-	cp $(srcdir)/tools/qmckl_probes.c $(srcdir)/src/qmckl_probes.c
-
-src/qmckl_probes.h: $(srcdir)/tools/qmckl_probes.h
-	cp $(srcdir)/tools/qmckl_probes.h $(srcdir)/src/qmckl_probes.h
-
-src/qmckl_probes_f.f90:
-	cp $(srcdir)/tools/qmckl_probes_f.f90 $(srcdir)/src/qmckl_probes_f.f90
-
 $(htmlize_el):
 	$(srcdir)/tools/install_htmlize.sh $(htmlize_el)
 
diff --git a/org/qmckl_ao.org b/org/qmckl_ao.org
index f1edca1..596287d 100644
--- a/org/qmckl_ao.org
+++ b/org/qmckl_ao.org
@@ -1772,19 +1772,19 @@ integer(c_int32_t) function test_qmckl_ao_gaussian_vgl(context) bind(C)
   test_qmckl_ao_gaussian_vgl = &
        qmckl_ao_gaussian_vgl(context, X, R, n, A, VGL, ldv)
 
-  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl_2,1"//C_NULL_CHAR, &
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl_2_1"//C_NULL_CHAR, &
     DBLE(VGL(2,1)))
 
-  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl_2,2"//C_NULL_CHAR, &
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl_2_2"//C_NULL_CHAR, &
     DBLE(VGL(2,2)))
 
-  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl_2,3"//C_NULL_CHAR, &
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl_2_3"//C_NULL_CHAR, &
     DBLE(VGL(2,3)))
 
-  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl_2,4"//C_NULL_CHAR, &
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl_2_4"//C_NULL_CHAR, &
     DBLE(VGL(2,4)))
 
-  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl_2,5"//C_NULL_CHAR, &
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "gaussian_vgl_2_5"//C_NULL_CHAR, &
     DBLE(VGL(2,5)))
 
 
@@ -2847,7 +2847,7 @@ integer(c_int32_t) function test_qmckl_ao_power(context) bind(C)
 
   test_qmckl_ao_power = qmckl_ao_power(context, n, X, LMAX, P, LDP)
 
-  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "power_2,2"//C_NULL_CHAR, &
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "power_2_2"//C_NULL_CHAR, &
     DBLE(P(2,2)))
 
   if (test_qmckl_ao_power /= QMCKL_SUCCESS) return
@@ -3187,19 +3187,19 @@ integer(c_int32_t) function test_qmckl_ao_polynomial_vgl(context) bind(C)
   test_qmckl_ao_polynomial_vgl = &
        qmckl_ao_polynomial_vgl(context, X, R, lmax, n, L, ldl, VGL, ldv)
 
-  vfc_err = <("ao"//C_NULL_CHAR, "polynomial_vgl_1,2"//C_NULL_CHAR, &
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "polynomial_vgl_1_2"//C_NULL_CHAR, &
     DBLE(VGL(1,2)))
 
-  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "polynomial_vgl_2,2"//C_NULL_CHAR, &
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "polynomial_vgl_2_2"//C_NULL_CHAR, &
     DBLE(VGL(2,2)))
 
-  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "polynomial_vgl_3,2"//C_NULL_CHAR, &
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "polynomial_vgl_3_2"//C_NULL_CHAR, &
     DBLE(VGL(3,2)))
 
-  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "polynomial_vgl_4,2"//C_NULL_CHAR, &
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "polynomial_vgl_4_2"//C_NULL_CHAR, &
     DBLE(VGL(4,2)))
 
-  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "polynomial_vgl_5,2"//C_NULL_CHAR, &
+  vfc_err = qmckl_probe("ao"//C_NULL_CHAR, "polynomial_vgl_5_2"//C_NULL_CHAR, &
     DBLE(VGL(5,2)))
 
   if (test_qmckl_ao_polynomial_vgl /= QMCKL_SUCCESS) return
diff --git a/org/qmckl_distance.org b/org/qmckl_distance.org
index 6ed9091..72282f3 100644
--- a/org/qmckl_distance.org
+++ b/org/qmckl_distance.org
@@ -323,22 +323,23 @@ integer(qmckl_exit_code) function test_qmckl_distance_sq(context) bind(C)
   test_qmckl_distance_sq = &
        qmckl_distance_sq(context, 'X', 't', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_sq_Xt_2,2", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance"//C_NULL_CHAR, "distance_sq_Xt_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
 
   if (test_qmckl_distance_sq == 0) return
 
+
   test_qmckl_distance_sq = &
        qmckl_distance_sq(context, 't', 'X', m, n, A, LDA, B, LDB, C, LDC)
 
-
-  vfc_err = qmckl_probe("distance", "distance_sq_tX_2,2", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance"//C_NULL_CHAR, "distance_sq_tX_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
 
   if (test_qmckl_distance_sq == 0) return
 
+
   test_qmckl_distance_sq = &
        qmckl_distance_sq(context, 'T', 't', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_sq_Tt_2,2", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance"//C_NULL_CHAR, "distance_sq_Tt_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
 
   if (test_qmckl_distance_sq == 0) return
 
@@ -359,7 +360,7 @@ integer(qmckl_exit_code) function test_qmckl_distance_sq(context) bind(C)
   test_qmckl_distance_sq = &
        qmckl_distance_sq(context, 'n', 'T', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_sq_nT_2,2", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance"//C_NULL_CHAR, "distance_sq_nT_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
 
   if (test_qmckl_distance_sq == 0) return
 
@@ -380,7 +381,7 @@ integer(qmckl_exit_code) function test_qmckl_distance_sq(context) bind(C)
   test_qmckl_distance_sq = &
        qmckl_distance_sq(context, 'T', 'n', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err =  qmckl_probe("distance", "distance_sq_Tn_2,2", DBLE(C(2,2)))
+  vfc_err =  qmckl_probe("distance"//C_NULL_CHAR, "distance_sq_Tn_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
 
   if (test_qmckl_distance_sq == 0) return
 
@@ -401,7 +402,7 @@ integer(qmckl_exit_code) function test_qmckl_distance_sq(context) bind(C)
   test_qmckl_distance_sq = &
        qmckl_distance_sq(context, 'n', 'N', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_sq_nN_2,2", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance"//C_NULL_CHAR, "distance_sq_nN_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
 
   if (test_qmckl_distance_sq == 0) return
 
@@ -760,21 +761,21 @@ integer(qmckl_exit_code) function test_qmckl_dist(context) bind(C)
   test_qmckl_dist = &
        qmckl_distance(context, 'X', 't', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_Xt_2,2", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance"//C_NULL_CHAR, "distance_Xt_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
 
   if (test_qmckl_dist == 0) return
 
   test_qmckl_dist = &
        qmckl_distance(context, 't', 'X', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_tX_2,2", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance"//C_NULL_CHAR, "distance_tX_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
 
   if (test_qmckl_dist == 0) return
 
   test_qmckl_dist = &
        qmckl_distance(context, 'T', 't', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_Tt_2,2", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance"//C_NULL_CHAR, "distance_Tt_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
 
   if (test_qmckl_dist == 0) return
 
@@ -795,7 +796,7 @@ integer(qmckl_exit_code) function test_qmckl_dist(context) bind(C)
   test_qmckl_dist = &
        qmckl_distance(context, 'n', 'T', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_nT_2,2", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance"//C_NULL_CHAR, "distance_nT_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
 
   if (test_qmckl_dist == 0) return
 
@@ -816,7 +817,7 @@ integer(qmckl_exit_code) function test_qmckl_dist(context) bind(C)
   test_qmckl_dist = &
        qmckl_distance(context, 'T', 'n', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_Tn_2,2", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance"//C_NULL_CHAR, "distance_Tn_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
 
   if (test_qmckl_dist == 0) return
 
@@ -837,7 +838,7 @@ integer(qmckl_exit_code) function test_qmckl_dist(context) bind(C)
   test_qmckl_dist = &
        qmckl_distance(context, 'n', 'N', m, n, A, LDA, B, LDB, C, LDC)
 
-  vfc_err = qmckl_probe("distance", "distance_nN_2,2", DBLE(C(2,2)))
+  vfc_err = qmckl_probe("distance"//C_NULL_CHAR, "distance_nN_2_2"//C_NULL_CHAR, DBLE(C(2,2)))
 
   if (test_qmckl_dist == 0) return