diff --git a/src/ExB_shear_flow_mod.F90 b/src/ExB_shear_flow_mod.F90
index e5ca9130a1adcda13ab3266138449bb399782753..ec34ae7d0017c4cac0f7d30548546af0e6686338 100644
--- a/src/ExB_shear_flow_mod.F90
+++ b/src/ExB_shear_flow_mod.F90
@@ -24,9 +24,9 @@ CONTAINS
     ! Setup the variables for the ExB shear
     SUBROUTINE Setup_ExB_shear_flow(ExBrate)
         USE grid,     ONLY: Nx, local_nky, total_nky, local_nx, Ny, deltakx, deltaky,&
-                            kyarray, kyarray_full, kx_max, kx_min
+                            kx_max, kx_min !kyarray, kyarray_full
         USE geometry, ONLY: Cyq0_x0, C_y
-        USE basic,    ONLY: dt
+        ! USE basic,    ONLY: dt
         USE model,    ONLY: LINEARITY
         IMPLICIT NONE
         INTEGER :: iky
@@ -90,12 +90,12 @@ CONTAINS
 
     ! update the ExB shear value for the next time step
     SUBROUTINE Update_ExB_shear_flow(step_number)
-        USE basic,      ONLY: dt,time
-        USE grid,       ONLY: local_nky, total_nky, kyarray, inv_dkx, kyarray_full, update_grids, deltaky
+        USE basic,      ONLY: dt!,time
+        USE grid,       ONLY: local_nky, total_nky, kyarray, inv_dkx, update_grids, deltaky!,kyarray_full
         USE geometry,   ONLY: gxx,gxy,gyy,inv_hatB2, evaluate_magn_curv
         USE numerics,   ONLY: evaluate_EM_op, evaluate_kernels
         USE model,      ONLY: LINEARITY
-        USE time_integration, ONLY: c_E, ntimelevel
+        USE time_integration, ONLY: c_E!, ntimelevel
         IMPLICIT NONE
         INTEGER, INTENT(IN) :: step_number
         ! local var
@@ -148,7 +148,7 @@ CONTAINS
     ! the fields by imposing a shift on kx
     SUBROUTINE Array_shift_ExB_shear_flow
         USE grid,       ONLY: local_nky, total_nky, update_grids, &
-            total_nkx, deltakx, kx_min, kx_max, kxarray0, inv_dkx
+            total_nkx, deltakx, kxarray0, inv_dkx!,kx_min, kx_max
         USE prec_const, ONLY: PI
         USE fields,     ONLY: moments, phi, psi
         USE numerics,   ONLY: evaluate_EM_op, evaluate_kernels
@@ -218,10 +218,10 @@ CONTAINS
     END SUBROUTINE Array_shift_ExB_shear_flow
 
     SUBROUTINE Update_nonlinear_ExB_factors(dt_sub)
-        USE grid,  ONLY: local_nky, local_nky_offset, xarray, Nx, Ny, local_nx, deltakx,&
-                         local_nx_offset, ikyarray, inv_ikyarray, deltaky, update_grids
-        USE basic, ONLY: time, dt
-        USE time_integration, ONLY: c_E
+        USE grid,  ONLY: local_nky, local_nky_offset, Nx, Ny, local_nx, deltakx,&
+                         local_nx_offset, deltaky, update_grids!,xarray, ikyarray, inv_ikyarray
+        USE basic, ONLY: time!, dt
+        ! USE time_integration, ONLY: c_E
         IMPLICIT NONE
         REAL(xp), INTENT(IN) :: dt_sub        
         INTEGER :: iky, ix
diff --git a/src/fourier_mod.F90 b/src/fourier_mod.F90
index 3eb22833b2f42ba5e3a44d58e7249369da1cab0c..8a40f441b2387a9f5c4c8db395c3e758da668038 100644
--- a/src/fourier_mod.F90
+++ b/src/fourier_mod.F90
@@ -418,7 +418,7 @@ END SUBROUTINE fft1D_plans
         COMPLEX(xp), DIMENSION(NX_,local_nky_), INTENT(IN)  :: in_kxky
         COMPLEX(xp), DIMENSION(NX_,local_nky_), INTENT(OUT) :: out_xky
         ! local variables
-        COMPLEX(xp), DIMENSION(NX_) :: in_kx, out_x
+        ! COMPLEX(xp), DIMENSION(NX_) :: in_kx, out_x
         INTEGER :: iky
 #ifdef SINGLE_PRECISION
         !plan many 1D transforms
@@ -451,7 +451,7 @@ END SUBROUTINE fft1D_plans
         COMPLEX(xp), DIMENSION(NX_,local_nky_), INTENT(IN)  :: in_xky
         COMPLEX(xp), DIMENSION(NX_,local_nky_), INTENT(OUT) :: out_kxky
         ! local variables
-        COMPLEX(xp), DIMENSION(NX_) :: in_x, out_kx
+        ! COMPLEX(xp), DIMENSION(NX_) :: in_x, out_kx
         INTEGER :: iky
 #ifdef SINGLE_PRECISION
         CALL sfftw_execute_dft(plan_many_x2kx_c2c, in_xky, out_kxky)
@@ -520,8 +520,8 @@ END SUBROUTINE fft1D_plans
         REAL(xp),    DIMENSION(NY_,    local_nx_), INTENT(IN)  :: in_yx
         COMPLEX(xp), DIMENSION(NY_/2+1,local_nx_), INTENT(OUT) :: out_kyx
         ! local var.
-        REAL(xp),    DIMENSION(NY_)     :: in_y
-        COMPLEX(xp), DIMENSION(NY_/2+1) :: out_ky
+        ! REAL(xp),    DIMENSION(NY_)     :: in_y
+        ! COMPLEX(xp), DIMENSION(NY_/2+1) :: out_ky
         ! COMPLEX(xp), DIMENSION(NY_halved+1,local_nx_) :: out_kyx_test
         INTEGER :: ix, iy, iky
 #ifdef SINGLE_PRECISION
@@ -559,9 +559,9 @@ END SUBROUTINE fft1D_plans
         COMPLEX(xp), DIMENSION(NY_/2+1,local_nx_), INTENT(IN)  :: in_kyx
         REAL(xp),    DIMENSION(NY_    ,local_nx_), INTENT(OUT) :: out_yx
         ! local var.
-        COMPLEX(xp), DIMENSION(Ny_/2+1) :: in_ky
-        REAL(xp),    DIMENSION(NY_)     :: out_y
-        REAL(xp),    DIMENSION(NY_,local_nx_) :: out_yx_test
+        ! COMPLEX(xp), DIMENSION(Ny_/2+1) :: in_ky
+        ! REAL(xp),    DIMENSION(NY_)     :: out_y
+        ! REAL(xp),    DIMENSION(NY_,local_nx_) :: out_yx_test
         INTEGER :: ix, iy, iky
 #ifdef SINGLE_PRECISION
         CALL sfftw_execute_dft_c2r(plan_many_ky2y_c2r, in_kyx, out_yx)
diff --git a/src/initial_mod.F90 b/src/initial_mod.F90
index 343e5bcf30ba1360b8985b4fe98648920105c051..d06c7cde87e44761b61523e11f198de0e7959866 100644
--- a/src/initial_mod.F90
+++ b/src/initial_mod.F90
@@ -34,7 +34,7 @@ CONTAINS
     USE prec_const
     IMPLICIT NONE
     ! Local var
-    INTEGER :: im, ikx_, iky_, amp_
+    INTEGER :: im, amp_
     NAMELIST /INITIAL/ INIT_OPT,ACT_ON_MODES,&
                        init_amp,init_background,init_noiselvl,iseed,&
                        Nmodes
@@ -297,7 +297,6 @@ CONTAINS
   SUBROUTINE init_modes
     USE fields,     ONLY: moments
     USE prec_const, ONLY: xp
-    USE parallel,   ONLY: my_id
     USE model,      ONLY: LINEARITY
     USE grid,       ONLY: total_nkx, local_nkx_offset, local_nky, local_nky_offset,&
                           kxarray_full, kyarray, kx_max, kx_min, ky_max
@@ -337,7 +336,7 @@ CONTAINS
               IF ( (ikx+local_nkx_offset .EQ. I_) .AND. &
                     (iky+local_nky_offset .EQ. J_) ) THEN
                 ! WRITE(*,'(A10,F4.2,A,F4.2,A,F4.2)') '-init (kx=',kx_,',ky=',ky_,') at Amp=',A_               
-                WRITE(*,'(A,F5.3,A,F5.3,A,G8.2)') '-init (kx=',kx_,',ky=',ky_,') with Amp= ',A_
+                WRITE(*,'(A,F5.3,A,F5.3,A,G9.2)') '-init (kx=',kx_,',ky=',ky_,') with Amp= ',A_
                 moments(:,:,:,iky,ikx,:,:) = A_
               ENDIF
             ENDDO
diff --git a/src/nonlinear_mod.F90 b/src/nonlinear_mod.F90
index 4c7f1eafe7a8c48d3ab141ee2ccc69d05c5554ce..62abc850d8452ceade677f6d23ea1eec96cb597b 100644
--- a/src/nonlinear_mod.F90
+++ b/src/nonlinear_mod.F90
@@ -56,7 +56,7 @@ SUBROUTINE compute_nonlinear
   IMPLICIT NONE
   INTEGER :: iz,ij,ip,eo,ia,ikx,iky,izi,ipi,iji,ini,isi
   INTEGER :: ikxExBp, ikxExBn ! Negative and positive ExB flow indices
-  COMPLEX(xp), DIMENSION(Ny/2+1,local_nx) :: invinvfactor ! TEST
+  ! COMPLEX(xp), DIMENSION(Ny/2+1,local_nx) :: invinvfactor ! TEST
   z:DO iz = 1,local_nz
     izi = iz + ngz/2
     j:DO ij = 1,local_nj ! Loop over Laguerre moments