diff --git a/source/KKRhost/rhovalnew.F90 b/source/KKRhost/rhovalnew.F90
index 6ebde86ade65de2120cd2106f7b85380e56c6c65..c905ee55005624d04720aac77e35cde599ca0b74 100644
--- a/source/KKRhost/rhovalnew.F90
+++ b/source/KKRhost/rhovalnew.F90
@@ -602,8 +602,8 @@ contains
         alphall = czero
         ! faster calculation of RLLLEFT and SLLLEFT.
         if (.not.set_cheby_nospeedup .and. .not. (calc_exchange_couplings .or. write_pkkr_operators)) then
-          call rll_global_solutions(rpan_intervall, rnew, vnspll(:,:,:,ith),ullleft(:,:,:,ith), rllleft(:,:,:,ith), tmattemp, ncheb, npan_tot, lmmaxd, nvec*lmmaxd, nsra*(1+korbit)*(lmax+1), irmdnew, nsra, &
-            jlk_index, hlk2(:,:,ith), jlk2(:,:,ith), hlk(:,:,ith), jlk(:,:,ith), gmatprefactor, '1', use_sratrick,               alphall)
+          call rll_global_solutions(rpan_intervall, rnew, vnspll(:,:,:,ith), ullleft(:,:,:,ith), rllleft(:,:,:,ith), tmattemp, ncheb, npan_tot, lmmaxd, nvec*lmmaxd, nsra*(1+korbit)*(lmax+1), irmdnew, nsra, &
+            jlk_index, hlk2(:,:,ith), jlk2(:,:,ith), hlk(:,:,ith), jlk(:,:,ith), gmatprefactor, '1', use_sratrick, alphall)
           call sll_global_solutions(rpan_intervall, rnew, vnspll(:,:,:,ith), sllleft(:,:,:,ith), ncheb, npan_tot, lmmaxd, nvec*lmmaxd, nsra*(1+korbit)*(lmax+1), irmdnew, nsra, jlk_index, &
             hlk2(:,:,ith), jlk2(:,:,ith), hlk(:,:,ith), jlk(:,:,ith), gmatprefactor, '1', use_sratrick)
         else
diff --git a/source/KKRhost/tmat_newsolver.F90 b/source/KKRhost/tmat_newsolver.F90
index 5927d95230fa7d49376ea75e8b5a1a9aacce7b2b..25e34fcb02b33ef453819c7ef1e93fb12e3c5782 100644
--- a/source/KKRhost/tmat_newsolver.F90
+++ b/source/KKRhost/tmat_newsolver.F90
@@ -214,15 +214,14 @@ contains
 
     ! set up the non-spherical ll' matrix for potential VLL' (done in VLLMAT)
     call vllmat(1, nrmaxd, irmdnew, lmmax0d, lmmaxd, vnspll0, vins, lmpot, cleb, icleb, iend, nspin/(nspin-korbit), zat, rnew, use_sratrick, ncleb)
-#ifdef CPP_BdG
     ! test writeout of VNSPLL1
     if (write_BdG_tests) then
-      open (7352834, file='vnspll.txt', form='formatted')
+      write (filename, '(A,I0.3,A)') 'vnspll_', i1, '.txt'
+      open (7352834, file=trim(filename), form='formatted')
       write (7352834, '(A,3I9)') '# lmmaxd,lmmaxd,IRMDNEW=', lmmaxd, lmmaxd, irmdnew
-      write (7352834, '(2ES25.16)') vnspll0(:, :, :)
+      write (7352834, '(2ES25.9)') vnspll0(:, :, :)
       close (7352834)
     end if
-#endif
     ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     ! LDAU
     ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -356,15 +355,14 @@ contains
 #ifdef CPP_OMP
         !$omp critical
 #endif
-#ifdef CPP_BdG
         ! test writeout of VNSPLL1
         if (write_BdG_tests) then
-          open (7352834, file='vnspll_SOC.txt', form='formatted')
+          write (filename, '(A,I0.3,A,I0.3,A)') 'vnspll_SOC_', i1, '_energ_', ie, '.txt'
+          open (7352834, file=trim(filename), form='formatted')
           write (7352834, '(A,3I9)') '# lmmaxd,lmmaxd,IRMDNEW=', lmmaxd, lmmaxd, irmdnew
-          write (7352834, '(2ES25.16)') vnspll1(:, :, :, ith)
+          write (7352834, '(2ES25.9)') vnspll1(:, :, :, ith)
           close (7352834)
         end if
-#endif
 #ifdef CPP_OMP
         !$omp end critical
 #endif
@@ -387,19 +385,18 @@ contains
 #ifdef CPP_OMP
         !$omp critical
 #endif
-#ifdef CPP_BdG
         ! test writeout of VNPSLL
         if (write_BdG_tests) then
-          open (7352834, file='vnspll_sra.txt', form='formatted')
+          write (filename, '(A,I0.3,A,I0.3,A)') 'vnspll_sra_', i1, '_energ_', ie, '.txt'
+          open (7352834, file=trim(filename), form='formatted')
           if (nsra==2) then
             write (7352834, '(A,3I9)') '# 2*lmmaxd,2*lmmaxd,IRMDNEW=', 2*lmmaxd, 2*lmmaxd, irmdnew
           else
             write (7352834, '(A,3I9)') '# lmmaxd,lmmaxd,IRMDNEW=', lmmaxd, lmmaxd, irmdnew
           end if
-          write (7352834, '(2ES25.16)') vnspll(:, :, :, ith)
+          write (7352834, '(2ES25.9)') vnspll(:, :, :, ith)
           close (7352834)
         end if
-#endif
 #ifdef CPP_OMP
         !$omp end critical
 #endif