diff --git a/src/MNH/advection_metsv.f90 b/src/MNH/advection_metsv.f90
index a585c3f9944087e86942526a7a3cec09056a712e..5426d3bde08b4c0c23229519ee6b0f46814cc259 100644
--- a/src/MNH/advection_metsv.f90
+++ b/src/MNH/advection_metsv.f90
@@ -464,7 +464,7 @@ END IF
 ZTSTEP_PPM = PTSTEP / REAL(KSPLIT)
 !
 !
-!*      2.4 normalized contravariant components for splitted PPM time-step
+!*      2.4 normalized contravariant components for split PPM time-step
 !
 ZRUCPPM = ZRUCPPM*ZTSTEP_PPM
 ZRVCPPM = ZRVCPPM*ZTSTEP_PPM
diff --git a/src/MNH/advecuvw_rk.f90 b/src/MNH/advecuvw_rk.f90
index 4bc7c2f271dad8f291ae4a3dc5afb8f55f460e54..79168aa8d613162a8211d62b1440c4ab4db5f35c 100644
--- a/src/MNH/advecuvw_rk.f90
+++ b/src/MNH/advecuvw_rk.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2019 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
 !MNH_LIC for details. version 1.
@@ -194,7 +194,6 @@ TYPE(LIST_ll), POINTER      :: TZFIELDS0_ll ! list of fields to exchange
 TYPE(LIST_ll), POINTER      :: TZFIELDS4_ll ! list of fields to exchange
 !
 !
-REAL          :: XPRECISION
 !-------------------------------------------------------------------------------
 !
 !*       0.     INITIALIZATION                        
diff --git a/src/MNH/anel_balancen.f90 b/src/MNH/anel_balancen.f90
index 743c5b5c7f57048cb103e29372c2e9748c70dd21..540e56b76eff1ad6c19ca1cf4fc79da078cb12ae 100644
--- a/src/MNH/anel_balancen.f90
+++ b/src/MNH/anel_balancen.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
 !MNH_LIC for details. version 1.
@@ -169,8 +169,6 @@ INTEGER                       ::       IRRI    ! Number of solid water variables
 REAL                          ::  ZDRYMASST    ! Mass of dry air Md
 REAL                          ::  ZREFMASS     ! Total mass of the ref. atmosphere
 REAL                          ::  ZMASS_O_PHI0 ! Mass / Phi0
-LOGICAL                       ::  GCLOSE_OUT   ! switch for the LFI writing
-CHARACTER (LEN= 28)           ::  YFMFILE      ! virtual FM file
 INTEGER                       ::  IMI          ! model index
 !JUAN
 INTEGER                               ::  IIU_B,IJU_B,IKU
@@ -266,8 +264,6 @@ ZMASS_O_PHI0 = 1.    !      |  which is here not needed                    |
 IRR  = 0             !      |                                              |
 IRRL = 0             !      |                                              |
 IRRI = 0             !       ==============================================
-GCLOSE_OUT=.FALSE.
-YFMFILE='UNUSED'
 !
 IMI = GET_CURRENT_MODEL_INDEX()
 CALL PRESSUREZ(CLBCX,CLBCY,CPRESOPT,NITR,LITRADJ,ITCOUNT,XRELAX,IMI,  &
diff --git a/src/MNH/budget.f90 b/src/MNH/budget.f90
index ebb03d46600115920b308e7267a66fa08681ebcc..692fe059c630c0939ca9d867c16f2d37a4f32f8c 100644
--- a/src/MNH/budget.f90
+++ b/src/MNH/budget.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
 !MNH_LIC for details. version 1.
@@ -58,8 +58,10 @@ subroutine Budget_store_init( tpbudget, hsource, pvars )
   call Budget_source_id_find( tpbudget, hsource, iid )
 
   if ( tpbudget%ntmpstoresource /= 0 ) then
-    call Print_msg( NVERB_ERROR, 'BUD', 'Budget_store_init', 'ntmpstoresource already set (previous call to ' &
-                    //'Budget_store_end missing?) for '//trim( tpbudget%cname )//':'//trim( hsource ) )
+    cmnhmsg(1) = 'ntmpstoresource already set (previous call to '//'Budget_store_end missing?)'
+    cmnhmsg(2) = 'Set for:    ' // Trim( tpbudget%cname ) // ':' // Trim( tpbudget%tsources(tpbudget%ntmpstoresource)%cmnhname )
+    cmnhmsg(3) = 'Working on: ' // Trim( tpbudget%cname ) // ':' // Trim( hsource )
+    call Print_msg( NVERB_ERROR, 'BUD', 'Budget_store_init' )
   end if
 
   if ( tpbudget%tsources(iid)%ldonotinit ) then
diff --git a/src/MNH/contrav.f90 b/src/MNH/contrav.f90
index a5b30eff1e82af71bb0b62302f1a30666ad63bea..50e81468802efef8d210ae1736c96011e3bbbede 100644
--- a/src/MNH/contrav.f90
+++ b/src/MNH/contrav.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 1994-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 1994-2021 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
 !MNH_LIC for details. version 1.
@@ -148,8 +148,6 @@ INTEGER:: IW,IE,IS,IN   ! Coordinate of forth order diffusion area
 TYPE(LIST_ll),      POINTER :: TZFIELD_U, TZFIELD_V, TZFIELD_DZX, TZFIELD_DZY
 TYPE(HALO2LIST_ll), POINTER :: TZHALO2_U, TZHALO2_V, TZHALO2_DZX, TZHALO2_DZY
 INTEGER                     :: IINFO_ll
-!JUAN
-REAL          :: XPRECISION
 !-----------------------------------------------------------------------
 !
 !*       1.    Compute the horizontal contravariant components
diff --git a/src/MNH/ion_drift.f90 b/src/MNH/ion_drift.f90
index b3187ca833f755e9a0ad1ab341f829d89d26c633..7d863c9182faea2b9a54f8ecbf6c2186e74c0578 100644
--- a/src/MNH/ion_drift.f90
+++ b/src/MNH/ion_drift.f90
@@ -1,4 +1,4 @@
-!MNH_LIC Copyright 2010-2020 CNRS, Meteo-France and Universite Paul Sabatier
+!MNH_LIC Copyright 2010-2021 CNRS, Meteo-France and Universite Paul Sabatier
 !MNH_LIC This is part of the Meso-NH software governed by the CeCILL-C licence
 !MNH_LIC version 1. See LICENSE, CeCILL-C_V1-en.txt and CeCILL-C_V1-fr.txt
 !MNH_LIC for details. version 1.
@@ -12,7 +12,7 @@ INTERFACE
       SUBROUTINE ION_DRIFT(PDRIFTP, PDRIFTM, PSVT, HLBCX, HLBCY)
 !
 CHARACTER(LEN=4), DIMENSION(2), INTENT(IN)    :: HLBCX,HLBCY
-REAL, DIMENSION(:,:,:),         INTENT(INOUT) :: PDRIFTP, PDRIFTM
+REAL, DIMENSION(:,:,:),         INTENT(OUT)   :: PDRIFTP, PDRIFTM
 REAL, DIMENSION(:,:,:,:),       INTENT(INOUT) :: PSVT
 !
 END SUBROUTINE ION_DRIFT
@@ -65,7 +65,7 @@ IMPLICIT NONE
 !*       0.1   declarations of arguments
 !
 CHARACTER(LEN=4), DIMENSION(2), INTENT(IN)    :: HLBCX,HLBCY
-REAL, DIMENSION(:,:,:),         INTENT(INOUT) :: PDRIFTP, PDRIFTM
+REAL, DIMENSION(:,:,:),         INTENT(OUT)   :: PDRIFTP, PDRIFTM
 REAL, DIMENSION(:,:,:,:),       INTENT(INOUT) :: PSVT
 !
 !