diff --git a/org/qmckl_jastrow.org b/org/qmckl_jastrow.org
index 017e372..7b5bcee 100644
--- a/org/qmckl_jastrow.org
+++ b/org/qmckl_jastrow.org
@@ -1509,11 +1509,11 @@ end function qmckl_compute_asymp_jasb_f
 
 #+begin_src c :comments org :tangle (eval c) :noweb yes
 qmckl_exit_code qmckl_compute_asymp_jasb (
-	  const qmckl_context context,
-	  const int64_t bord_num,
-	  const double* bord_vector,
-	  const double rescale_factor_kappa_ee,
-	  double* const asymp_jasb ) {
+    const qmckl_context context,
+    const int64_t bord_num,
+    const double* bord_vector,
+    const double rescale_factor_kappa_ee,
+    double* const asymp_jasb ) {
 
     if (context == QMCKL_NULL_CONTEXT){
       return QMCKL_INVALID_CONTEXT;
@@ -1545,11 +1545,11 @@ qmckl_exit_code qmckl_compute_asymp_jasb (
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_asymp_jasb (
-	  const qmckl_context context,
-	  const int64_t bord_num,
-	  const double* bord_vector,
-	  const double rescale_factor_kappa_ee,
-	  double* const asymp_jasb );
+      const qmckl_context context,
+      const int64_t bord_num,
+      const double* bord_vector,
+      const double rescale_factor_kappa_ee,
+      double* const asymp_jasb );
     #+end_src
 
 
@@ -1827,15 +1827,15 @@ end function qmckl_compute_factor_ee_f
 
 #+begin_src c   :comments org :tangle (eval c) :noweb yes
 qmckl_exit_code qmckl_compute_factor_ee (
-	  const qmckl_context context,
-	  const int64_t walk_num,
-	  const int64_t elec_num,
-	  const int64_t up_num,
-	  const int64_t bord_num,
-	  const double* bord_vector,
-	  const double* ee_distance_rescaled,
-	  const double* asymp_jasb,
-	  double* const factor_ee ) {
+      const qmckl_context context,
+      const int64_t walk_num,
+      const int64_t elec_num,
+      const int64_t up_num,
+      const int64_t bord_num,
+      const double* bord_vector,
+      const double* ee_distance_rescaled,
+      const double* asymp_jasb,
+      double* const factor_ee ) {
 
   int ipar; // can we use a smaller integer?
   double x, x1, spin_fact, power_ser;
@@ -1896,15 +1896,15 @@ qmckl_exit_code qmckl_compute_factor_ee (
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_factor_ee (
-	  const qmckl_context context,
-	  const int64_t walk_num,
-	  const int64_t elec_num,
-	  const int64_t up_num,
-	  const int64_t bord_num,
-	  const double* bord_vector,
-	  const double* ee_distance_rescaled,
-	  const double* asymp_jasb,
-	  double* const factor_ee );
+      const qmckl_context context,
+      const int64_t walk_num,
+      const int64_t elec_num,
+      const int64_t up_num,
+      const int64_t bord_num,
+      const double* bord_vector,
+      const double* ee_distance_rescaled,
+      const double* asymp_jasb,
+      double* const factor_ee );
     #+end_src
 
 
@@ -2207,16 +2207,16 @@ end function qmckl_compute_factor_ee_deriv_e_f
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_factor_ee_deriv_e (
-	  const qmckl_context context,
-	  const int64_t walk_num,
-	  const int64_t elec_num,
-	  const int64_t up_num,
-	  const int64_t bord_num,
-	  const double* bord_vector,
-	  const double* ee_distance_rescaled,
-	  const double* ee_distance_rescaled_deriv_e,
-	  const double* asymp_jasb,
-	  double* const factor_ee_deriv_e );
+      const qmckl_context context,
+      const int64_t walk_num,
+      const int64_t elec_num,
+      const int64_t up_num,
+      const int64_t bord_num,
+      const double* bord_vector,
+      const double* ee_distance_rescaled,
+      const double* ee_distance_rescaled_deriv_e,
+      const double* asymp_jasb,
+      double* const factor_ee_deriv_e );
     #+end_src
 
 
@@ -2225,17 +2225,17 @@ end function qmckl_compute_factor_ee_deriv_e_f
     #+RESULTS:
     #+begin_src f90 :tangle (eval f) :comments org :exports none
 integer(c_int32_t) function qmckl_compute_factor_ee_deriv_e &
-	(context, &
-		 walk_num, &
-		 elec_num, &
-		 up_num, &
-		 bord_num, &
-		 bord_vector, &
-		 ee_distance_rescaled, &
-		 ee_distance_rescaled_deriv_e, &
-		 asymp_jasb, &
-		 factor_ee_deriv_e) &
-	bind(C) result(info)
+    (context, &
+         walk_num, &
+         elec_num, &
+         up_num, &
+         bord_num, &
+         bord_vector, &
+         ee_distance_rescaled, &
+         ee_distance_rescaled_deriv_e, &
+         asymp_jasb, &
+         factor_ee_deriv_e) &
+    bind(C) result(info)
 
       use, intrinsic :: iso_c_binding
       implicit none
@@ -2253,16 +2253,16 @@ integer(c_int32_t) function qmckl_compute_factor_ee_deriv_e &
 
       integer(c_int32_t), external :: qmckl_compute_factor_ee_deriv_e_f
       info = qmckl_compute_factor_ee_deriv_e_f &
-	     (context, &
-		 walk_num, &
-		 elec_num, &
-		 up_num, &
-		 bord_num, &
-		 bord_vector, &
-		 ee_distance_rescaled, &
-		 ee_distance_rescaled_deriv_e, &
-		 asymp_jasb, &
-		 factor_ee_deriv_e)
+         (context, &
+         walk_num, &
+         elec_num, &
+         up_num, &
+         bord_num, &
+         bord_vector, &
+         ee_distance_rescaled, &
+         ee_distance_rescaled_deriv_e, &
+         asymp_jasb, &
+         factor_ee_deriv_e)
 
     end function qmckl_compute_factor_ee_deriv_e
     #+end_src
@@ -2593,16 +2593,16 @@ end function qmckl_compute_factor_en_f
 
     #+begin_src c :comments org :tangle (eval c) :noweb yes
 qmckl_exit_code qmckl_compute_factor_en (
-	  const qmckl_context context,
-	  const int64_t walk_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t type_nucl_num,
-	  const int64_t* type_nucl_vector,
-	  const int64_t aord_num,
-	  const double* aord_vector,
-	  const double* en_distance_rescaled,
-	  double* const factor_en ) {
+      const qmckl_context context,
+      const int64_t walk_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t type_nucl_num,
+      const int64_t* type_nucl_vector,
+      const int64_t aord_num,
+      const double* aord_vector,
+      const double* en_distance_rescaled,
+      double* const factor_en ) {
 
   double  x, x1, power_ser;
 
@@ -2681,16 +2681,16 @@ qmckl_exit_code qmckl_compute_factor_en (
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_factor_en (
-	  const qmckl_context context,
-	  const int64_t walk_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t type_nucl_num,
-	  const int64_t* type_nucl_vector,
-	  const int64_t aord_num,
-	  const double* aord_vector,
-	  const double* en_distance_rescaled,
-	  double* const factor_en );
+      const qmckl_context context,
+      const int64_t walk_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t type_nucl_num,
+      const int64_t* type_nucl_vector,
+      const int64_t aord_num,
+      const double* aord_vector,
+      const double* en_distance_rescaled,
+      double* const factor_en );
     #+end_src
 
 
@@ -2975,17 +2975,17 @@ end function qmckl_compute_factor_en_deriv_e_f
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_factor_en_deriv_e (
-	  const qmckl_context context,
-	  const int64_t walk_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t type_nucl_num,
-	  const int64_t* type_nucl_vector,
-	  const int64_t aord_num,
-	  const double* aord_vector,
-	  const double* en_distance_rescaled,
-	  const double* en_distance_rescaled_deriv_e,
-	  double* const factor_en_deriv_e );
+      const qmckl_context context,
+      const int64_t walk_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t type_nucl_num,
+      const int64_t* type_nucl_vector,
+      const int64_t aord_num,
+      const double* aord_vector,
+      const double* en_distance_rescaled,
+      const double* en_distance_rescaled_deriv_e,
+      double* const factor_en_deriv_e );
     #+end_src
 
 
@@ -2994,18 +2994,18 @@ end function qmckl_compute_factor_en_deriv_e_f
     #+RESULTS:
     #+begin_src f90 :tangle (eval f) :comments org :exports none
     integer(c_int32_t) function qmckl_compute_factor_en_deriv_e &
-	(context, &
-		 walk_num, &
-		 elec_num, &
-		 nucl_num, &
-		 type_nucl_num, &
-		 type_nucl_vector, &
-		 aord_num, &
-		 aord_vector, &
-		 en_distance_rescaled, &
-		 en_distance_rescaled_deriv_e, &
-		 factor_en_deriv_e) &
-	bind(C) result(info)
+    (context, &
+         walk_num, &
+         elec_num, &
+         nucl_num, &
+         type_nucl_num, &
+         type_nucl_vector, &
+         aord_num, &
+         aord_vector, &
+         en_distance_rescaled, &
+         en_distance_rescaled_deriv_e, &
+         factor_en_deriv_e) &
+    bind(C) result(info)
 
       use, intrinsic :: iso_c_binding
       implicit none
@@ -3024,17 +3024,17 @@ end function qmckl_compute_factor_en_deriv_e_f
 
       integer(c_int32_t), external :: qmckl_compute_factor_en_deriv_e_f
       info = qmckl_compute_factor_en_deriv_e_f &
-	     (context, &
-		 walk_num, &
-		 elec_num, &
-		 nucl_num, &
-		 type_nucl_num, &
-		 type_nucl_vector, &
-		 aord_num, &
-		 aord_vector, &
-		 en_distance_rescaled, &
-		 en_distance_rescaled_deriv_e, &
-		 factor_en_deriv_e)
+         (context, &
+         walk_num, &
+         elec_num, &
+         nucl_num, &
+         type_nucl_num, &
+         type_nucl_vector, &
+         aord_num, &
+         aord_vector, &
+         en_distance_rescaled, &
+         en_distance_rescaled_deriv_e, &
+         factor_en_deriv_e)
 
     end function qmckl_compute_factor_en_deriv_e
     #+end_src
@@ -3371,13 +3371,13 @@ end function qmckl_compute_een_rescaled_e_f
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_een_rescaled_e (
-	  const qmckl_context context,
-	  const int64_t walk_num,
-	  const int64_t elec_num,
-	  const int64_t cord_num,
-	  const double rescale_factor_kappa_ee,
-	  const double* ee_distance,
-	  double* const een_rescaled_e );
+      const qmckl_context context,
+      const int64_t walk_num,
+      const int64_t elec_num,
+      const int64_t cord_num,
+      const double rescale_factor_kappa_ee,
+      const double* ee_distance,
+      double* const een_rescaled_e );
     #+end_src
 
     #+CALL: generate_c_interface(table=qmckl_factor_een_rescaled_e_args,rettyp=get_value("CRetType"),fname=get_value("Name"))
@@ -3385,9 +3385,9 @@ end function qmckl_compute_een_rescaled_e_f
     #+RESULTS:
     #+begin_src f90 :tangle (eval f) :comments org :exports none
     integer(c_int32_t) function qmckl_compute_een_rescaled_e &
-	(context, walk_num, elec_num, cord_num, rescale_factor_kappa_ee, &
+    (context, walk_num, elec_num, cord_num, rescale_factor_kappa_ee, &
         ee_distance, een_rescaled_e) &
-	bind(C) result(info)
+    bind(C) result(info)
 
       use, intrinsic :: iso_c_binding
       implicit none
@@ -3402,7 +3402,7 @@ end function qmckl_compute_een_rescaled_e_f
 
       integer(c_int32_t), external :: qmckl_compute_een_rescaled_e_f
       info = qmckl_compute_een_rescaled_e_f &
-	     (context, walk_num, elec_num, cord_num, rescale_factor_kappa_ee, ee_distance, een_rescaled_e)
+         (context, walk_num, elec_num, cord_num, rescale_factor_kappa_ee, ee_distance, een_rescaled_e)
 
     end function qmckl_compute_een_rescaled_e
     #+end_src
@@ -3709,15 +3709,15 @@ end function qmckl_compute_factor_een_rescaled_e_deriv_e_f
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_factor_een_rescaled_e_deriv_e (
-	  const qmckl_context context,
-	  const int64_t walk_num,
-	  const int64_t elec_num,
-	  const int64_t cord_num,
-	  const double rescale_factor_kappa_ee,
-	  const double* coord_new,
-	  const double* ee_distance,
-	  const double* een_rescaled_e,
-	  double* const een_rescaled_e_deriv_e );
+      const qmckl_context context,
+      const int64_t walk_num,
+      const int64_t elec_num,
+      const int64_t cord_num,
+      const double rescale_factor_kappa_ee,
+      const double* coord_new,
+      const double* ee_distance,
+      const double* een_rescaled_e,
+      double* const een_rescaled_e_deriv_e );
     #+end_src
 
 
@@ -3726,16 +3726,16 @@ end function qmckl_compute_factor_een_rescaled_e_deriv_e_f
     #+RESULTS:
     #+begin_src f90 :tangle (eval f) :comments org :exports none
     integer(c_int32_t) function qmckl_compute_factor_een_rescaled_e_deriv_e &
-	(context, &
-		 walk_num, &
-		 elec_num, &
-		 cord_num, &
-		 rescale_factor_kappa_ee, &
-		 coord_new, &
-		 ee_distance, &
-		 een_rescaled_e, &
-		 een_rescaled_e_deriv_e) &
-	bind(C) result(info)
+    (context, &
+         walk_num, &
+         elec_num, &
+         cord_num, &
+         rescale_factor_kappa_ee, &
+         coord_new, &
+         ee_distance, &
+         een_rescaled_e, &
+         een_rescaled_e_deriv_e) &
+    bind(C) result(info)
 
       use, intrinsic :: iso_c_binding
       implicit none
@@ -3752,15 +3752,15 @@ end function qmckl_compute_factor_een_rescaled_e_deriv_e_f
 
       integer(c_int32_t), external :: qmckl_compute_factor_een_rescaled_e_deriv_e_f
       info = qmckl_compute_factor_een_rescaled_e_deriv_e_f &
-	     (context, &
-		 walk_num, &
-		 elec_num, &
-		 cord_num, &
-		 rescale_factor_kappa_ee, &
-		 coord_new, &
-		 ee_distance, &
-		 een_rescaled_e, &
-		 een_rescaled_e_deriv_e)
+         (context, &
+         walk_num, &
+         elec_num, &
+         cord_num, &
+         rescale_factor_kappa_ee, &
+         coord_new, &
+         ee_distance, &
+         een_rescaled_e, &
+         een_rescaled_e_deriv_e)
 
     end function qmckl_compute_factor_een_rescaled_e_deriv_e
     #+end_src
@@ -4064,14 +4064,14 @@ end function qmckl_compute_een_rescaled_n_f
 
     #+begin_src c :comments org :tangle (eval c) :noweb yes
 qmckl_exit_code qmckl_compute_een_rescaled_n (
-	  const qmckl_context context,
-	  const int64_t walk_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t cord_num,
-	  const double rescale_factor_kappa_en,
-	  const double* en_distance,
-	  double* const een_rescaled_n ) {
+      const qmckl_context context,
+      const int64_t walk_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t cord_num,
+      const double rescale_factor_kappa_en,
+      const double* en_distance,
+      double* const een_rescaled_n ) {
 
 
   if (context == QMCKL_NULL_CONTEXT) {
@@ -4131,14 +4131,14 @@ qmckl_exit_code qmckl_compute_een_rescaled_n (
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_een_rescaled_n (
-	  const qmckl_context context,
-	  const int64_t walk_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t cord_num,
-	  const double rescale_factor_kappa_en,
-	  const double* en_distance,
-	  double* const een_rescaled_n );
+      const qmckl_context context,
+      const int64_t walk_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t cord_num,
+      const double rescale_factor_kappa_en,
+      const double* en_distance,
+      double* const een_rescaled_n );
     #+end_src
 
 *** Test
@@ -4438,17 +4438,17 @@ end function qmckl_compute_factor_een_rescaled_n_deriv_e_f
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_factor_een_rescaled_n_deriv_e (
-	  const qmckl_context context,
-	  const int64_t walk_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t cord_num,
-	  const double rescale_factor_kappa_en,
-	  const double* coord_new,
-	  const double* coord,
-	  const double* en_distance,
-	  const double* een_rescaled_n,
-	  double* const een_rescaled_n_deriv_e );
+      const qmckl_context context,
+      const int64_t walk_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t cord_num,
+      const double rescale_factor_kappa_en,
+      const double* coord_new,
+      const double* coord,
+      const double* en_distance,
+      const double* een_rescaled_n,
+      double* const een_rescaled_n_deriv_e );
     #+end_src
 
     #+CALL: generate_c_interface(table=qmckl_compute_factor_een_rescaled_n_deriv_e_args,rettyp=get_value("CRetType"),fname=get_value("Name"))
@@ -4456,18 +4456,18 @@ end function qmckl_compute_factor_een_rescaled_n_deriv_e_f
     #+RESULTS:
     #+begin_src f90 :tangle (eval f) :comments org :exports none
     integer(c_int32_t) function qmckl_compute_factor_een_rescaled_n_deriv_e &
-	(context, &
-		 walk_num, &
-		 elec_num, &
-		 nucl_num, &
-		 cord_num, &
-		 rescale_factor_kappa_en, &
-		 coord_new, &
-		 coord, &
-		 en_distance, &
-		 een_rescaled_n, &
-		 een_rescaled_n_deriv_e) &
-	bind(C) result(info)
+    (context, &
+         walk_num, &
+         elec_num, &
+         nucl_num, &
+         cord_num, &
+         rescale_factor_kappa_en, &
+         coord_new, &
+         coord, &
+         en_distance, &
+         een_rescaled_n, &
+         een_rescaled_n_deriv_e) &
+    bind(C) result(info)
 
       use, intrinsic :: iso_c_binding
       implicit none
@@ -4486,17 +4486,17 @@ end function qmckl_compute_factor_een_rescaled_n_deriv_e_f
 
       integer(c_int32_t), external :: qmckl_compute_factor_een_rescaled_n_deriv_e_f
       info = qmckl_compute_factor_een_rescaled_n_deriv_e_f &
-	     (context, &
-		 walk_num, &
-		 elec_num, &
-		 nucl_num, &
-		 cord_num, &
-		 rescale_factor_kappa_en, &
-		 coord_new, &
-		 coord, &
-		 en_distance, &
-		 een_rescaled_n, &
-		 een_rescaled_n_deriv_e)
+         (context, &
+         walk_num, &
+         elec_num, &
+         nucl_num, &
+         cord_num, &
+         rescale_factor_kappa_en, &
+         coord_new, &
+         coord, &
+         en_distance, &
+         een_rescaled_n, &
+         een_rescaled_n_deriv_e)
 
     end function qmckl_compute_factor_een_rescaled_n_deriv_e
     #+end_src
@@ -4914,7 +4914,7 @@ qmckl_exit_code qmckl_provide_tmp_c(qmckl_context context)
                                  ctx->jastrow.tmp_c);
 
         #endif
-		  break;
+          break;
       case OFFLOAD_CUBLAS:
         #ifdef HAVE_CUBLAS_OFFLOAD
           rc =
@@ -4936,7 +4936,7 @@ qmckl_exit_code qmckl_provide_tmp_c(qmckl_context context)
                                 ctx->jastrow.een_rescaled_n,
                                 ctx->jastrow.tmp_c);
         #endif
-		  break;
+          break;
       default:
         rc = qmckl_compute_tmp_c(context,
                                  ctx->jastrow.cord_num,
@@ -4946,7 +4946,7 @@ qmckl_exit_code qmckl_provide_tmp_c(qmckl_context context)
                                  ctx->jastrow.een_rescaled_e,
                                  ctx->jastrow.een_rescaled_n,
                                  ctx->jastrow.tmp_c);
-		break;
+        break;
     }
 
     ctx->jastrow.tmp_c_date = ctx->date;
@@ -5009,7 +5009,7 @@ qmckl_exit_code qmckl_provide_dtmp_c(qmckl_context context)
                                 ctx->jastrow.een_rescaled_n,
                                 ctx->jastrow.dtmp_c);
         #endif
-		  break;
+          break;
       case OFFLOAD_CUBLAS:
         #ifdef HAVE_CUBLAS_OFFLOAD
           rc = qmckl_compute_dtmp_c_acc_offload(context,
@@ -5030,7 +5030,7 @@ qmckl_exit_code qmckl_provide_dtmp_c(qmckl_context context)
                                 ctx->jastrow.een_rescaled_n,
                                 ctx->jastrow.dtmp_c);
         #endif
-		  break;
+          break;
       default:
         rc = qmckl_compute_dtmp_c(context,
                                 ctx->jastrow.cord_num,
@@ -5040,7 +5040,7 @@ qmckl_exit_code qmckl_provide_dtmp_c(qmckl_context context)
                                 ctx->jastrow.een_rescaled_e_deriv_e,
                                 ctx->jastrow.een_rescaled_n,
                                 ctx->jastrow.dtmp_c);
-		  break;
+          break;
     }
 
     if (rc != QMCKL_SUCCESS) {
@@ -5113,9 +5113,9 @@ end function qmckl_compute_dim_cord_vect_f
 
     #+begin_src c :comments org :tangle (eval c) :noweb yes
 qmckl_exit_code qmckl_compute_dim_cord_vect (
-	  const qmckl_context context,
-	  const int64_t cord_num,
-	  int64_t* const dim_cord_vect){
+      const qmckl_context context,
+      const int64_t cord_num,
+      int64_t* const dim_cord_vect){
   
   int         lmax;
 
@@ -5153,9 +5153,9 @@ qmckl_exit_code qmckl_compute_dim_cord_vect (
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_dim_cord_vect (
-	  const qmckl_context context,
-	  const int64_t cord_num,
-	  int64_t* const dim_cord_vect );
+      const qmckl_context context,
+      const int64_t cord_num,
+      int64_t* const dim_cord_vect );
     #+end_src
 
 
@@ -5229,13 +5229,13 @@ end function qmckl_compute_cord_vect_full_f
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_cord_vect_full (
-	  const qmckl_context context,
-	  const int64_t nucl_num,
-	  const int64_t dim_cord_vect,
-	  const int64_t type_nucl_num,
-	  const int64_t* type_nucl_vector,
-	  const double* cord_vector,
-	  double* const cord_vect_full );
+      const qmckl_context context,
+      const int64_t nucl_num,
+      const int64_t dim_cord_vect,
+      const int64_t type_nucl_num,
+      const int64_t* type_nucl_vector,
+      const double* cord_vector,
+      double* const cord_vect_full );
     #+end_src
 
 
@@ -5244,8 +5244,8 @@ end function qmckl_compute_cord_vect_full_f
     #+RESULTS:
     #+begin_src f90 :tangle (eval f) :comments org :exports none
     integer(c_int32_t) function qmckl_compute_cord_vect_full &
-	(context, nucl_num, dim_cord_vect, type_nucl_num, type_nucl_vector, cord_vector, cord_vect_full) &
-	bind(C) result(info)
+    (context, nucl_num, dim_cord_vect, type_nucl_num, type_nucl_vector, cord_vector, cord_vect_full) &
+    bind(C) result(info)
 
       use, intrinsic :: iso_c_binding
       implicit none
@@ -5260,7 +5260,7 @@ end function qmckl_compute_cord_vect_full_f
 
       integer(c_int32_t), external :: qmckl_compute_cord_vect_full_f
       info = qmckl_compute_cord_vect_full_f &
-	     (context, nucl_num, dim_cord_vect, type_nucl_num, type_nucl_vector, cord_vector, cord_vect_full)
+         (context, nucl_num, dim_cord_vect, type_nucl_num, type_nucl_vector, cord_vector, cord_vect_full)
 
     end function qmckl_compute_cord_vect_full
     #+end_src
@@ -5336,10 +5336,10 @@ end function qmckl_compute_lkpm_combined_index_f
 
     #+begin_src c :comments org :tangle (eval c) :noweb yes
 qmckl_exit_code qmckl_compute_lkpm_combined_index (
-	  const qmckl_context context,
-	  const int64_t cord_num,
-	  const int64_t dim_cord_vect,
-	  int64_t* const lkpm_combined_index ) {
+      const qmckl_context context,
+      const int64_t cord_num,
+      const int64_t dim_cord_vect,
+      int64_t* const lkpm_combined_index ) {
 
   int kk, lmax, m;
 
@@ -5386,10 +5386,10 @@ qmckl_exit_code qmckl_compute_lkpm_combined_index (
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_lkpm_combined_index (
-	  const qmckl_context context,
-	  const int64_t cord_num,
-	  const int64_t dim_cord_vect,
-	  int64_t* const lkpm_combined_index );
+      const qmckl_context context,
+      const int64_t cord_num,
+      const int64_t dim_cord_vect,
+      int64_t* const lkpm_combined_index );
     #+end_src
 
 
@@ -5511,14 +5511,14 @@ end function qmckl_compute_tmp_c_doc
 
     #+begin_src c :comments org :tangle (eval c) :noweb yes
 qmckl_exit_code qmckl_compute_tmp_c_hpc (
-	  const qmckl_context context,
-	  const int64_t cord_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t walk_num,
-	  const double* een_rescaled_e,
-	  const double* een_rescaled_n,
-	  double* const tmp_c ) {
+      const qmckl_context context,
+      const int64_t cord_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t walk_num,
+      const double* een_rescaled_e,
+      const double* een_rescaled_n,
+      double* const tmp_c ) {
 
   if (context == QMCKL_NULL_CONTEXT) {
     return QMCKL_INVALID_CONTEXT;
@@ -5662,14 +5662,14 @@ qmckl_exit_code qmckl_compute_tmp_c (const qmckl_context context,
     #+begin_src c :comments org :tangle (eval c) :noweb yes
 #ifdef HAVE_OPENACC_OFFLOAD
 qmckl_exit_code qmckl_compute_tmp_c_acc_offload (
-	  const qmckl_context context,
-	  const int64_t cord_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t walk_num,
-	  const double* een_rescaled_e,
-	  const double* een_rescaled_n,
-	  double* const tmp_c ) {
+      const qmckl_context context,
+      const int64_t cord_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t walk_num,
+      const double* een_rescaled_e,
+      const double* een_rescaled_n,
+      double* const tmp_c ) {
 
   if (context == QMCKL_NULL_CONTEXT) {
     return QMCKL_INVALID_CONTEXT;
@@ -5689,31 +5689,40 @@ qmckl_exit_code qmckl_compute_tmp_c_acc_offload (
 
   // Compute array access strides:
   // For tmp_c...
-  int stride_k_c  = elec_num;
-  int stride_j_c  = stride_k_c * nucl_num;
-  int stride_i_c  = stride_j_c * (cord_num+1);
-  int stride_nw_c = stride_i_c * cord_num;
+  const int64_t stride_k_c  = elec_num;
+  const int64_t stride_j_c  = stride_k_c * nucl_num;
+  const int64_t stride_i_c  = stride_j_c * (cord_num+1);
+  const int64_t stride_nw_c = stride_i_c * cord_num;
   // For een_rescaled_e...
-  int stride_m_e  = elec_num;
-  int stride_i_e  = stride_m_e * elec_num;
-  int stride_nw_e = stride_i_e * (cord_num+1);
+  const int64_t stride_m_e  = elec_num;
+  const int64_t stride_i_e  = stride_m_e * elec_num;
+  const int64_t stride_nw_e = stride_i_e * (cord_num+1);
   // For een_rescaled_n...
-  int stride_k_n  = elec_num;
-  int stride_j_n  = stride_k_n * nucl_num;
-  int stride_nw_n = stride_j_n * (cord_num+1);
+  const int64_t stride_k_n  = elec_num;
+  const int64_t stride_j_n  = stride_k_n * nucl_num;
+  const int64_t stride_nw_n = stride_j_n * (cord_num+1);
 
-  #pragma acc parallel
-  #pragma acc loop independent gang worker vector collapse(5)
-  for (int nw=0; nw < walk_num; ++nw) {
-    for (int i=0; i<cord_num; ++i){
+  const int64_t size_tmp_c = elec_num*nucl_num*(cord_num+1)*cord_num*walk_num;
+  const int64_t size_e = walk_num*(cord_num+1)*elec_num*elec_num;
+  const int64_t size_n = walk_num*(cord_num+1)*nucl_num*elec_num; 
 
-      // Replacement for single DGEMM
-      for (int j=0; j<cord_num+1; j++) {
+  #pragma acc parallel create(tmp_c[0:size_tmp_c]) copyout(tmp_c [0:size_tmp_c]) copyin(een_rescaled_e[0:size_e], een_rescaled_n[0:size_n])
+  {
+      #pragma acc loop independent gang worker vector
+      for (int64_t i=0 ; i<size_tmp_c ; ++i)
+          tmp_c[i] = 0.;
+
+      #pragma acc loop independent gang worker vector collapse(5)
+      for (int nw=0; nw < walk_num; ++nw) {
+        for (int i=0; i<cord_num; ++i){
+
+          // Replacement for single DGEMM
+          for (int j=0; j<cord_num+1; j++) {
         for (int k=0; k<nucl_num; k++) {
           for (int l=0; l<elec_num; l++) {
 
             // Single reduction
-			  tmp_c[l + k*stride_k_c + j*stride_j_c + i*stride_i_c + nw*stride_nw_c] = 0;
+                  tmp_c[l + k*stride_k_c + j*stride_j_c + i*stride_i_c + nw*stride_nw_c] = 0;
             for (int m=0; m<elec_num; m++) {
               tmp_c[l + k*stride_k_c + j*stride_j_c + i*stride_i_c + nw*stride_nw_c] =
               tmp_c[l + k*stride_k_c + j*stride_j_c + i*stride_i_c + nw*stride_nw_c] +
@@ -5723,8 +5732,9 @@ qmckl_exit_code qmckl_compute_tmp_c_acc_offload (
 
           }
         }
+          }
+        }
       }
-    }
   }
 
   return QMCKL_SUCCESS;
@@ -5738,14 +5748,14 @@ qmckl_exit_code qmckl_compute_tmp_c_acc_offload (
     #+begin_src c :tangle (eval h_func) :comments org
 #ifdef HAVE_OPENACC_OFFLOAD
     qmckl_exit_code qmckl_compute_tmp_c_acc_offload (
-	  const qmckl_context context,
-	  const int64_t cord_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t walk_num,
-	  const double* een_rescaled_e,
-	  const double* een_rescaled_n,
-	  double* const tmp_c );
+      const qmckl_context context,
+      const int64_t cord_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t walk_num,
+      const double* een_rescaled_e,
+      const double* een_rescaled_n,
+      double* const tmp_c );
 #endif
     #+end_src
 
@@ -5774,14 +5784,14 @@ qmckl_exit_code qmckl_compute_tmp_c_acc_offload (
     #+begin_src c :comments org :tangle (eval c) :noweb yes
 #ifdef HAVE_CUBLAS_OFFLOAD
 qmckl_exit_code qmckl_compute_tmp_c_cublas_offload (
-	  const qmckl_context context,
-	  const int64_t cord_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t walk_num,
-	  const double* een_rescaled_e,
-	  const double* een_rescaled_n,
-	  double* const tmp_c ) {
+      const qmckl_context context,
+      const int64_t cord_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t walk_num,
+      const double* een_rescaled_e,
+      const double* een_rescaled_n,
+      double* const tmp_c ) {
 
   if (context == QMCKL_NULL_CONTEXT) {
     return QMCKL_INVALID_CONTEXT;
@@ -5847,14 +5857,14 @@ qmckl_exit_code qmckl_compute_tmp_c_cublas_offload (
     #+begin_src c :tangle (eval h_func) :comments org
 #ifdef HAVE_CUBLAS_OFFLOAD
     qmckl_exit_code qmckl_compute_tmp_c_cublas_offload (
-	  const qmckl_context context,
-	  const int64_t cord_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t walk_num,
-	  const double* een_rescaled_e,
-	  const double* een_rescaled_n,
-	  double* const tmp_c );
+      const qmckl_context context,
+      const int64_t cord_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t walk_num,
+      const double* een_rescaled_e,
+      const double* een_rescaled_n,
+      double* const tmp_c );
 #endif
     #+end_src
 
@@ -6076,26 +6086,26 @@ qmckl_exit_code qmckl_compute_dtmp_c (const qmckl_context context,
 
     #+begin_src c :tangle (eval h_private_func) :comments org
     qmckl_exit_code qmckl_compute_dtmp_c_doc (
-	  const qmckl_context context,
-	  const int64_t cord_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t walk_num,
-	  const double* een_rescaled_e_deriv_e,
-	  const double* een_rescaled_n,
-	  double* const dtmp_c );
+      const qmckl_context context,
+      const int64_t cord_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t walk_num,
+      const double* een_rescaled_e_deriv_e,
+      const double* een_rescaled_n,
+      double* const dtmp_c );
     #+end_src
 
     #+begin_src c :tangle (eval h_private_func) :comments org
 qmckl_exit_code qmckl_compute_dtmp_c_hpc (
-	  const qmckl_context context,
-	  const int64_t cord_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t walk_num,
-	  const double* een_rescaled_e_deriv_e,
-	  const double* een_rescaled_n,
-	  double* const dtmp_c );
+      const qmckl_context context,
+      const int64_t cord_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t walk_num,
+      const double* een_rescaled_e_deriv_e,
+      const double* een_rescaled_n,
+      double* const dtmp_c );
     #+end_src
     
 *** Compute dtmp_c (OpenACC offload)
@@ -6106,29 +6116,29 @@ qmckl_exit_code qmckl_compute_dtmp_c_hpc (
    :END:
 
     #+NAME: qmckl_factor_dtmp_c_acc_offload_args
-    | Variable                 | Type                                                             | In/Out | Description                                   |
-    |--------------------------+------------------------------------------------------------------+--------+-----------------------------------------------|
-    | ~context~                | ~qmckl_context~                                                  | in     | Global state                                  |
-    | ~cord_num~               | ~int64_t~                                                        | in     | Order of polynomials                          |
-    | ~elec_num~               | ~int64_t~                                                        | in     | Number of electrons                           |
-    | ~nucl_num~               | ~int64_t~                                                        | in     | Number of nucleii                             |
-    | ~walk_num~               | ~int64_t~                                                        | in     | Number of walkers                             |
-    | ~een_rescaled_e_deriv_e~ | ~double[walk_num][0:cord_num][elec_num][4][elec_num]~            | in     | Electron-electron rescaled factor derivatives |
-    | ~een_rescaled_n~         | ~double[walk_num][0:cord_num][nucl_num][elec_num]~               | in     | Electron-nucleus rescaled factor              |
-    | ~dtmp_c~                 | ~double[walk_num][0:cord_num-1][0:cord_num][nucl_num][elec_num]~ | out    | vector of non-zero coefficients               |
+    | Variable                 | Type                                                                | In/Out | Description                                   |
+    |--------------------------+---------------------------------------------------------------------+--------+-----------------------------------------------|
+    | ~context~                | ~qmckl_context~                                                     | in     | Global state                                  |
+    | ~cord_num~               | ~int64_t~                                                           | in     | Order of polynomials                          |
+    | ~elec_num~               | ~int64_t~                                                           | in     | Number of electrons                           |
+    | ~nucl_num~               | ~int64_t~                                                           | in     | Number of nucleii                             |
+    | ~walk_num~               | ~int64_t~                                                           | in     | Number of walkers                             |
+    | ~een_rescaled_e_deriv_e~ | ~double[walk_num][0:cord_num][elec_num][4][elec_num]~               | in     | Electron-electron rescaled factor derivatives |
+    | ~een_rescaled_n~         | ~double[walk_num][0:cord_num][nucl_num][elec_num]~                  | in     | Electron-nucleus rescaled factor              |
+    | ~dtmp_c~                 | ~double[walk_num][0:cord_num-1][0:cord_num][nucl_num][4][elec_num]~ | out    | vector of non-zero coefficients               |
 
 
     #+begin_src c :comments org :tangle (eval c) :noweb yes
 #ifdef HAVE_OPENACC_OFFLOAD
 qmckl_exit_code qmckl_compute_dtmp_c_acc_offload (
-	  const qmckl_context context,
-	  const int64_t cord_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t walk_num,
-	  const double* een_rescaled_e_deriv_e,
-	  const double* een_rescaled_n,
-	  double* const dtmp_c ) {
+      const qmckl_context context,
+      const int64_t cord_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t walk_num,
+      const double* een_rescaled_e_deriv_e,
+      const double* een_rescaled_n,
+      double* const dtmp_c ) {
 
   if (context == QMCKL_NULL_CONTEXT) {
      return QMCKL_INVALID_CONTEXT;
@@ -6148,46 +6158,56 @@ qmckl_exit_code qmckl_compute_dtmp_c_acc_offload (
 
   // Compute strides...
   // For dtmp_c
-  int stride_l_d  = elec_num;
-  int stride_k_d  = stride_l_d * 4;
-  int stride_j_d  = stride_k_d * nucl_num;
-  int stride_i_d  = stride_j_d * (cord_num+1);
-  int stride_nw_d = stride_i_d * cord_num;
+  const int64_t stride_l_d  = elec_num;
+  const int64_t stride_k_d  = stride_l_d * 4;
+  const int64_t stride_j_d  = stride_k_d * nucl_num;
+  const int64_t stride_i_d  = stride_j_d * (cord_num+1);
+  const int64_t stride_nw_d = stride_i_d * cord_num;
   // For een_rescaled_e_deriv_e
-  int stride_l_e  = elec_num;
-  int stride_n_e  = stride_l_e * 4;
-  int stride_i_e  = stride_n_e * elec_num;
-  int stride_nw_e = stride_i_e * cord_num;
+  const int64_t stride_l_e  = elec_num;
+  const int64_t stride_n_e  = stride_l_e * 4;
+  const int64_t stride_i_e  = stride_n_e * elec_num;
+  const int64_t stride_nw_e = stride_i_e * cord_num;
   // For een_rescaled_n
-  int stride_k_n  = elec_num;
-  int stride_j_n  = stride_k_n * nucl_num;
-  int stride_nw_n = stride_j_n * (cord_num+1);
+  const int64_t stride_k_n  = elec_num;
+  const int64_t stride_j_n  = stride_k_n * nucl_num;
+  const int64_t stride_nw_n = stride_j_n * (cord_num+1);
 
 
-  #pragma acc parallel
-  #pragma loop independent gang worker vector collapse(6)
-  for (int nw=0; nw < walk_num; nw++) {
-    for (int i=0; i < cord_num; i++) {
+  const int64_t size_dtmp_c = walk_num*cord_num*(cord_num+1)*nucl_num*4*elec_num;
+  const int64_t size_n = walk_num*(cord_num+1)*nucl_num*elec_num; 
+  const int64_t size_e = walk_num*(cord_num+1)*elec_num*4*elec_num;
 
-      // Single DGEMM
-      for(int j=0; j<cord_num+1; j++) {
-        for(int k=0; k<nucl_num; k++) {
-          for(int l=0; l<4; l++) {
-            for(int m=0; m<elec_num; m++) {
+  #pragma acc parallel create(dtmp_c[0:size_dtmp_c]) copyout(dtmp_c [0:size_dtmp_c]) copyin(een_rescaled_e_deriv_e[0:size_e], een_rescaled_n[0:size_n])
+  {
+      #pragma acc loop independent gang worker vector
+      for (int64_t i=0 ; i<size_dtmp_c ; ++i)
+          dtmp_c[i] = 0.;
 
-              // Single reduction
-				dtmp_c[m + l * stride_l_d + k * stride_k_d + j * stride_j_d + i * stride_i_d + nw * stride_nw_d] = 0;
-              for(int n=0; n<elec_num; n++){
+      #pragma loop independent gang worker vector collapse(6)
+      for (int nw=0; nw < walk_num; nw++) {
+        for (int i=0; i < cord_num; i++) {
+
+          // Single DGEMM
+          for(int j=0; j<cord_num+1; j++) {
+            for(int k=0; k<nucl_num; k++) {
+              for(int l=0; l<4; l++) {
+                for(int m=0; m<elec_num; m++) {
+          
+                  // Single reduction
+                        dtmp_c[m + l * stride_l_d + k * stride_k_d + j * stride_j_d + i * stride_i_d + nw * stride_nw_d] = 0;
+                  for(int n=0; n<elec_num; n++){
                 dtmp_c[m + l * stride_l_d + k * stride_k_d + j * stride_j_d + i * stride_i_d + nw * stride_nw_d] =
                 dtmp_c[m + l * stride_l_d + k * stride_k_d + j * stride_j_d + i * stride_i_d + nw * stride_nw_d] +
                 een_rescaled_e_deriv_e[m + l * stride_l_e +  n * stride_n_e + i * stride_i_e + nw * stride_nw_e] *
                 een_rescaled_n[n + k * stride_k_n + j * stride_j_n + nw * stride_nw_n];
+                  }
+                }
               }
             }
           }
         }
       }
-    }
   }
 
   return QMCKL_SUCCESS;
@@ -6202,14 +6222,14 @@ qmckl_exit_code qmckl_compute_dtmp_c_acc_offload (
 
 #ifdef HAVE_OPENACC_OFFLOAD
     qmckl_exit_code qmckl_compute_dtmp_c_acc_offload (
-	  const qmckl_context context,
-	  const int64_t cord_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t walk_num,
-	  const double* een_rescaled_e_deriv_e,
-	  const double* een_rescaled_n,
-	  double* const dtmp_c );
+      const qmckl_context context,
+      const int64_t cord_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t walk_num,
+      const double* een_rescaled_e_deriv_e,
+      const double* een_rescaled_n,
+      double* const dtmp_c );
 #endif
     #+end_src
 *** Compute dtmp_c (cuBLAS offload)
@@ -6235,14 +6255,14 @@ qmckl_exit_code qmckl_compute_dtmp_c_acc_offload (
     #+begin_src c :comments org :tangle (eval c) :noweb yes
 #ifdef HAVE_CUBLAS_OFFLOAD
 qmckl_exit_code qmckl_compute_dtmp_c_cublas_offload (
-	  const qmckl_context context,
-	  const int64_t cord_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t walk_num,
-	  const double* een_rescaled_e_deriv_e,
-	  const double* een_rescaled_n,
-	  double* const dtmp_c ) {
+      const qmckl_context context,
+      const int64_t cord_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t walk_num,
+      const double* een_rescaled_e_deriv_e,
+      const double* een_rescaled_n,
+      double* const dtmp_c ) {
 
   if (context == QMCKL_NULL_CONTEXT) {
      return QMCKL_INVALID_CONTEXT;
@@ -6309,14 +6329,14 @@ qmckl_exit_code qmckl_compute_dtmp_c_cublas_offload (
 
 #ifdef HAVE_CUBLAS_OFFLOAD
     qmckl_exit_code qmckl_compute_dtmp_c_cublas_offload (
-	  const qmckl_context context,
-	  const int64_t cord_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t walk_num,
-	  const double* een_rescaled_e_deriv_e,
-	  const double* een_rescaled_n,
-	  double* const dtmp_c );
+      const qmckl_context context,
+      const int64_t cord_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t walk_num,
+      const double* een_rescaled_e_deriv_e,
+      const double* een_rescaled_n,
+      double* const dtmp_c );
 #endif
     #+end_src
 
@@ -6634,17 +6654,17 @@ end function qmckl_compute_factor_een_naive_f
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_factor_een_naive (
-	  const qmckl_context context,
-	  const int64_t walk_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t cord_num,
-	  const int64_t dim_cord_vect,
-	  const double* cord_vect_full,
-	  const int64_t* lkpm_combined_index,
-	  const double* een_rescaled_e,
-	  const double* een_rescaled_n,
-	  double* const factor_een );
+      const qmckl_context context,
+      const int64_t walk_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t cord_num,
+      const int64_t dim_cord_vect,
+      const double* cord_vect_full,
+      const int64_t* lkpm_combined_index,
+      const double* een_rescaled_e,
+      const double* een_rescaled_n,
+      double* const factor_een );
     #+end_src
 
     #+CALL: generate_c_interface(table=qmckl_factor_een_naive_args,rettyp=get_value("CRetType"),fname=get_value("Name"))
@@ -6652,18 +6672,18 @@ end function qmckl_compute_factor_een_naive_f
     #+RESULTS:
     #+begin_src f90 :tangle (eval f) :comments org :exports none
     integer(c_int32_t) function qmckl_compute_factor_een_naive &
-	(context, &
-		 walk_num, &
-		 elec_num, &
-		 nucl_num, &
-		 cord_num, &
-		 dim_cord_vect, &
-		 cord_vect_full, &
-		 lkpm_combined_index, &
-		 een_rescaled_e, &
-		 een_rescaled_n, &
-		 factor_een) &
-	bind(C) result(info)
+    (context, &
+         walk_num, &
+         elec_num, &
+         nucl_num, &
+         cord_num, &
+         dim_cord_vect, &
+         cord_vect_full, &
+         lkpm_combined_index, &
+         een_rescaled_e, &
+         een_rescaled_n, &
+         factor_een) &
+    bind(C) result(info)
 
       use, intrinsic :: iso_c_binding
       implicit none
@@ -6682,17 +6702,17 @@ end function qmckl_compute_factor_een_naive_f
 
       integer(c_int32_t), external :: qmckl_compute_factor_een_naive_f
       info = qmckl_compute_factor_een_naive_f &
-	     (context, &
-		 walk_num, &
-		 elec_num, &
-		 nucl_num, &
-		 cord_num, &
-		 dim_cord_vect, &
-		 cord_vect_full, &
-		 lkpm_combined_index, &
-		 een_rescaled_e, &
-		 een_rescaled_n, &
-		 factor_een)
+         (context, &
+         walk_num, &
+         elec_num, &
+         nucl_num, &
+         cord_num, &
+         dim_cord_vect, &
+         cord_vect_full, &
+         lkpm_combined_index, &
+         een_rescaled_e, &
+         een_rescaled_n, &
+         factor_een)
 
     end function qmckl_compute_factor_een_naive
     #+end_src
@@ -6795,17 +6815,17 @@ end function qmckl_compute_factor_een_f
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_factor_een (
-	  const qmckl_context context,
-	  const int64_t walk_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t cord_num,
-	  const int64_t dim_cord_vect,
-	  const double* cord_vect_full,
-	  const int64_t* lkpm_combined_index,
-	  const double* een_rescaled_e,
-	  const double* een_rescaled_n,
-	  double* const factor_een );
+      const qmckl_context context,
+      const int64_t walk_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t cord_num,
+      const int64_t dim_cord_vect,
+      const double* cord_vect_full,
+      const int64_t* lkpm_combined_index,
+      const double* een_rescaled_e,
+      const double* een_rescaled_n,
+      double* const factor_een );
     #+end_src
 
     #+CALL: generate_c_interface(table=qmckl_factor_een_args,rettyp=get_value("CRetType"),fname=get_value("Name"))
@@ -6813,18 +6833,18 @@ end function qmckl_compute_factor_een_f
     #+RESULTS:
     #+begin_src f90 :tangle (eval f) :comments org :exports none
     integer(c_int32_t) function qmckl_compute_factor_een &
-	(context, &
-		 walk_num, &
-		 elec_num, &
-		 nucl_num, &
-		 cord_num, &
-		 dim_cord_vect, &
-		 cord_vect_full, &
-		 lkpm_combined_index, &
-		 een_rescaled_e, &
-		 een_rescaled_n, &
-		 factor_een) &
-	bind(C) result(info)
+    (context, &
+         walk_num, &
+         elec_num, &
+         nucl_num, &
+         cord_num, &
+         dim_cord_vect, &
+         cord_vect_full, &
+         lkpm_combined_index, &
+         een_rescaled_e, &
+         een_rescaled_n, &
+         factor_een) &
+    bind(C) result(info)
 
       use, intrinsic :: iso_c_binding
       implicit none
@@ -6843,17 +6863,17 @@ end function qmckl_compute_factor_een_f
 
       integer(c_int32_t), external :: qmckl_compute_factor_een_f
       info = qmckl_compute_factor_een_f &
-	     (context, &
-		 walk_num, &
-		 elec_num, &
-		 nucl_num, &
-		 cord_num, &
-		 dim_cord_vect, &
-		 cord_vect_full, &
-		 lkpm_combined_index, &
-		 een_rescaled_e, &
-		 een_rescaled_n, &
-		 factor_een)
+         (context, &
+         walk_num, &
+         elec_num, &
+         nucl_num, &
+         cord_num, &
+         dim_cord_vect, &
+         cord_vect_full, &
+         lkpm_combined_index, &
+         een_rescaled_e, &
+         een_rescaled_n, &
+         factor_een)
 
     end function qmckl_compute_factor_een
     #+end_src
@@ -7169,19 +7189,19 @@ end function qmckl_compute_factor_een_deriv_e_naive_f
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_factor_een_deriv_e_naive (
-	  const qmckl_context context,
-	  const int64_t walk_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t cord_num,
-	  const int64_t dim_cord_vect,
-	  const double* cord_vect_full,
-	  const int64_t* lkpm_combined_index,
-	  const double* een_rescaled_e,
-	  const double* een_rescaled_n,
-	  const double* een_rescaled_e_deriv_e,
-	  const double* een_rescaled_n_deriv_e,
-	  double* const factor_een_deriv_e );
+      const qmckl_context context,
+      const int64_t walk_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t cord_num,
+      const int64_t dim_cord_vect,
+      const double* cord_vect_full,
+      const int64_t* lkpm_combined_index,
+      const double* een_rescaled_e,
+      const double* een_rescaled_n,
+      const double* een_rescaled_e_deriv_e,
+      const double* een_rescaled_n_deriv_e,
+      double* const factor_een_deriv_e );
     #+end_src
 
 
@@ -7190,20 +7210,20 @@ end function qmckl_compute_factor_een_deriv_e_naive_f
     #+RESULTS:
     #+begin_src f90 :tangle (eval f) :comments org :exports none
     integer(c_int32_t) function qmckl_compute_factor_een_deriv_e_naive &
-	(context, &
-		 walk_num, &
-		 elec_num, &
-		 nucl_num, &
-		 cord_num, &
-		 dim_cord_vect, &
-		 cord_vect_full, &
-		 lkpm_combined_index, &
-		 een_rescaled_e, &
-		 een_rescaled_n, &
-		 een_rescaled_e_deriv_e, &
-		 een_rescaled_n_deriv_e, &
-		 factor_een_deriv_e) &
-	bind(C) result(info)
+    (context, &
+         walk_num, &
+         elec_num, &
+         nucl_num, &
+         cord_num, &
+         dim_cord_vect, &
+         cord_vect_full, &
+         lkpm_combined_index, &
+         een_rescaled_e, &
+         een_rescaled_n, &
+         een_rescaled_e_deriv_e, &
+         een_rescaled_n_deriv_e, &
+         factor_een_deriv_e) &
+    bind(C) result(info)
 
       use, intrinsic :: iso_c_binding
       implicit none
@@ -7224,19 +7244,19 @@ end function qmckl_compute_factor_een_deriv_e_naive_f
 
       integer(c_int32_t), external :: qmckl_compute_factor_een_deriv_e_naive_f
       info = qmckl_compute_factor_een_deriv_e_naive_f &
-	     (context, &
-		 walk_num, &
-		 elec_num, &
-		 nucl_num, &
-		 cord_num, &
-		 dim_cord_vect, &
-		 cord_vect_full, &
-		 lkpm_combined_index, &
-		 een_rescaled_e, &
-		 een_rescaled_n, &
-		 een_rescaled_e_deriv_e, &
-		 een_rescaled_n_deriv_e, &
-		 factor_een_deriv_e)
+         (context, &
+         walk_num, &
+         elec_num, &
+         nucl_num, &
+         cord_num, &
+         dim_cord_vect, &
+         cord_vect_full, &
+         lkpm_combined_index, &
+         een_rescaled_e, &
+         een_rescaled_n, &
+         een_rescaled_e_deriv_e, &
+         een_rescaled_n_deriv_e, &
+         factor_een_deriv_e)
 
     end function qmckl_compute_factor_een_deriv_e_naive
     #+end_src
@@ -7361,19 +7381,19 @@ end function qmckl_compute_factor_een_deriv_e_f
     #+RESULTS:
     #+begin_src c :tangle (eval h_func) :comments org
     qmckl_exit_code qmckl_compute_factor_een_deriv_e (
-	  const qmckl_context context,
-	  const int64_t walk_num,
-	  const int64_t elec_num,
-	  const int64_t nucl_num,
-	  const int64_t cord_num,
-	  const int64_t dim_cord_vect,
-	  const double* cord_vect_full,
-	  const int64_t* lkpm_combined_index,
-	  const double* tmp_c,
-	  const double* dtmp_c,
-	  const double* een_rescaled_n,
-	  const double* een_rescaled_n_deriv_e,
-	  double* const factor_een_deriv_e );
+      const qmckl_context context,
+      const int64_t walk_num,
+      const int64_t elec_num,
+      const int64_t nucl_num,
+      const int64_t cord_num,
+      const int64_t dim_cord_vect,
+      const double* cord_vect_full,
+      const int64_t* lkpm_combined_index,
+      const double* tmp_c,
+      const double* dtmp_c,
+      const double* een_rescaled_n,
+      const double* een_rescaled_n_deriv_e,
+      double* const factor_een_deriv_e );
     #+end_src
 
 
@@ -7382,20 +7402,20 @@ end function qmckl_compute_factor_een_deriv_e_f
     #+RESULTS:
     #+begin_src f90 :tangle (eval f) :comments org :exports none
     integer(c_int32_t) function qmckl_compute_factor_een_deriv_e &
-	(context, &
-		 walk_num, &
-		 elec_num, &
-		 nucl_num, &
-		 cord_num, &
-		 dim_cord_vect, &
-		 cord_vect_full, &
-		 lkpm_combined_index, &
-		 tmp_c, &
-		 dtmp_c, &
-		 een_rescaled_n, &
-		 een_rescaled_n_deriv_e, &
-		 factor_een_deriv_e) &
-	bind(C) result(info)
+    (context, &
+         walk_num, &
+         elec_num, &
+         nucl_num, &
+         cord_num, &
+         dim_cord_vect, &
+         cord_vect_full, &
+         lkpm_combined_index, &
+         tmp_c, &
+         dtmp_c, &
+         een_rescaled_n, &
+         een_rescaled_n_deriv_e, &
+         factor_een_deriv_e) &
+    bind(C) result(info)
 
       use, intrinsic :: iso_c_binding
       implicit none
@@ -7416,19 +7436,19 @@ end function qmckl_compute_factor_een_deriv_e_f
 
       integer(c_int32_t), external :: qmckl_compute_factor_een_deriv_e_f
       info = qmckl_compute_factor_een_deriv_e_f &
-	     (context, &
-		 walk_num, &
-		 elec_num, &
-		 nucl_num, &
-		 cord_num, &
-		 dim_cord_vect, &
-		 cord_vect_full, &
-		 lkpm_combined_index, &
-		 tmp_c, &
-		 dtmp_c, &
-		 een_rescaled_n, &
-		 een_rescaled_n_deriv_e, &
-		 factor_een_deriv_e)
+         (context, &
+         walk_num, &
+         elec_num, &
+         nucl_num, &
+         cord_num, &
+         dim_cord_vect, &
+         cord_vect_full, &
+         lkpm_combined_index, &
+         tmp_c, &
+         dtmp_c, &
+         een_rescaled_n, &
+         een_rescaled_n_deriv_e, &
+         factor_een_deriv_e)
 
     end function qmckl_compute_factor_een_deriv_e
     #+end_src