diff --git a/Changelog b/Changelog
index 00de9033..522791b1 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,12 @@
 Changelog. A lot less detailed than usual, at least for past
 	history.
+2017/04/09: Remove all remaining .F files, and remove configure checks for
+	F77. Define version 3.5.0
+2017/04/08: All PREC methods now invoked through preconditioner object. 	
+2017/04/05: make ISO_C_BINDING and MOVE_ALLOC mandatory prereq. 
+2017/03/20: Changes for GPU codes: added buffers to MAPs, reduce number of
+	malloc/free, added new maybe_free_buffers method on vector. 
+2017/02/12: New stopping criterion, soimplified mat_dist
 2017/02/06: Fixes for --enable-long-integers and for RPM build.
 2016/07/14: Fix matrix print with renumbering.	
 2016/06/18: New thresholds for quicksort	
diff --git a/base/comm/internals/Makefile b/base/comm/internals/Makefile
index 3ad38a1c..c6a7155b 100644
--- a/base/comm/internals/Makefile
+++ b/base/comm/internals/Makefile
@@ -23,7 +23,7 @@ lib: mpfobjs $(FOBJS) $(MPFOBJS)
 
 $(FOBJS) $(FBOJS2): $(MODDIR)/psi_mod.o
 mpfobjs: 
-	(make $(MPFOBJS) F90="$(MPF90)" FC="$(MPF90)" FCOPT="$(F90COPT)")	
+	(make $(MPFOBJS) FC="$(MPFC)" )	
 
 clean:
 	/bin/rm -f $(MPFOBJS) $(FOBJS) $(COBJS) $(FOBJS2) $(MPFOBJS2) *$(.mod)
diff --git a/base/modules/psb_const_mod.F90 b/base/modules/psb_const_mod.F90
index bcf602cc..45b5087a 100644
--- a/base/modules/psb_const_mod.F90
+++ b/base/modules/psb_const_mod.F90
@@ -89,9 +89,9 @@ module psb_const_mod
   ! 
   ! Version
   !
-  character(len=*), parameter    :: psb_version_string_ = "3.4.0"
+  character(len=*), parameter    :: psb_version_string_ = "3.5.0"
   integer(psb_ipk_), parameter   :: psb_version_major_  = 3
-  integer(psb_ipk_), parameter   :: psb_version_minor_  = 4
+  integer(psb_ipk_), parameter   :: psb_version_minor_  = 5
   integer(psb_ipk_), parameter   :: psb_patchlevel_     = 0
 
   !
diff --git a/prec/psb_c_bjacprec.f90 b/prec/psb_c_bjacprec.f90
index ceb60c61..dab99641 100644
--- a/prec/psb_c_bjacprec.f90
+++ b/prec/psb_c_bjacprec.f90
@@ -134,6 +134,7 @@ module psb_c_bjacprec
 contains
 
   subroutine psb_c_bjac_precdescr(prec,iout,root)
+    use psb_penv_mod
     use psb_penv_mod
     use psb_error_mod
     implicit none 
diff --git a/prec/psb_c_diagprec.f90 b/prec/psb_c_diagprec.f90
index a8267070..3326ccf1 100644
--- a/prec/psb_c_diagprec.f90
+++ b/prec/psb_c_diagprec.f90
@@ -161,6 +161,8 @@ contains
   
 
   subroutine psb_c_diag_precdescr(prec,iout,root)
+    use psb_penv_mod
+    use psb_error_mod
     use psb_penv_mod
     use psb_error_mod
     Implicit None
diff --git a/prec/psb_c_nullprec.f90 b/prec/psb_c_nullprec.f90
index 5304bff1..9d6f2508 100644
--- a/prec/psb_c_nullprec.f90
+++ b/prec/psb_c_nullprec.f90
@@ -159,6 +159,8 @@ contains
   subroutine psb_c_null_precdescr(prec,iout,root)
     use psb_penv_mod
     use psb_error_mod
+    use psb_penv_mod
+    use psb_error_mod
     
     Implicit None
 
diff --git a/prec/psb_s_bjacprec.f90 b/prec/psb_s_bjacprec.f90
index e8ec9b86..cc06ee5b 100644
--- a/prec/psb_s_bjacprec.f90
+++ b/prec/psb_s_bjacprec.f90
@@ -134,6 +134,7 @@ module psb_s_bjacprec
 contains
 
   subroutine psb_s_bjac_precdescr(prec,iout,root)
+    use psb_penv_mod
     use psb_penv_mod
     use psb_error_mod
     implicit none 
diff --git a/prec/psb_s_diagprec.f90 b/prec/psb_s_diagprec.f90
index cf7c5991..4b1b6f58 100644
--- a/prec/psb_s_diagprec.f90
+++ b/prec/psb_s_diagprec.f90
@@ -161,6 +161,8 @@ contains
   
 
   subroutine psb_s_diag_precdescr(prec,iout,root)
+    use psb_penv_mod
+    use psb_error_mod
     use psb_penv_mod
     use psb_error_mod
     Implicit None
diff --git a/prec/psb_s_nullprec.f90 b/prec/psb_s_nullprec.f90
index 8247573d..8ebdf7a4 100644
--- a/prec/psb_s_nullprec.f90
+++ b/prec/psb_s_nullprec.f90
@@ -159,6 +159,8 @@ contains
   subroutine psb_s_null_precdescr(prec,iout,root)
     use psb_penv_mod
     use psb_error_mod
+    use psb_penv_mod
+    use psb_error_mod
     
     Implicit None
 
diff --git a/prec/psb_z_bjacprec.f90 b/prec/psb_z_bjacprec.f90
index 2c63b002..26196b5c 100644
--- a/prec/psb_z_bjacprec.f90
+++ b/prec/psb_z_bjacprec.f90
@@ -134,6 +134,7 @@ module psb_z_bjacprec
 contains
 
   subroutine psb_z_bjac_precdescr(prec,iout,root)
+    use psb_penv_mod
     use psb_penv_mod
     use psb_error_mod
     implicit none 
diff --git a/prec/psb_z_diagprec.f90 b/prec/psb_z_diagprec.f90
index 7ddc168a..65d07651 100644
--- a/prec/psb_z_diagprec.f90
+++ b/prec/psb_z_diagprec.f90
@@ -161,6 +161,8 @@ contains
   
 
   subroutine psb_z_diag_precdescr(prec,iout,root)
+    use psb_penv_mod
+    use psb_error_mod
     use psb_penv_mod
     use psb_error_mod
     Implicit None
diff --git a/prec/psb_z_nullprec.f90 b/prec/psb_z_nullprec.f90
index d8c4f0ab..9a62b8e7 100644
--- a/prec/psb_z_nullprec.f90
+++ b/prec/psb_z_nullprec.f90
@@ -159,6 +159,8 @@ contains
   subroutine psb_z_null_precdescr(prec,iout,root)
     use psb_penv_mod
     use psb_error_mod
+    use psb_penv_mod
+    use psb_error_mod
     
     Implicit None