Index: src/com_mod.f90
===================================================================
--- src/com_mod.f90	(revision 05cf28de9ff073ff7e3cdc064f0ed59c61a6dd09)
+++ src/com_mod.f90	(revision 62e65c73ae7e3d8c4b8b884065ede76e07211ec8)
@@ -373,5 +373,5 @@
 !ZHG Sep 2015  
 !   real :: icloud_stats(0:nxmax-1,0:nymax-1,5,numwfmem)
-   real :: ctwc(0:nxmax-1,0:nymax-1,numwfmem) ! eso: =icloud_stats(:,:,4,:)
+   real :: ctwc(0:nxmax-1,0:nymax-1,numwfmem) ! ESO: =icloud_stats(:,:,4,:)
 
 
Index: src/ecmwf_mod.f90
===================================================================
--- src/ecmwf_mod.f90	(revision 8ed5f118d620a3361e5c818ce005de62c24d72d9)
+++ src/ecmwf_mod.f90	(revision 62e65c73ae7e3d8c4b8b884065ede76e07211ec8)
@@ -51,6 +51,5 @@
   !*********************************************
 
-  integer,parameter :: maxnests=1,nxmaxn=361,nymaxn=181
-!  integer,parameter :: maxnests=1,nxmaxn=86,nymaxn=31
+  integer,parameter :: maxnests=0,nxmaxn=361,nymaxn=181
 
   ! nxmax,nymax        maximum dimension of wind fields in x and y
Index: src/gfs_mod.f90
===================================================================
--- src/gfs_mod.f90	(revision 8ed5f118d620a3361e5c818ce005de62c24d72d9)
+++ src/gfs_mod.f90	(revision 62e65c73ae7e3d8c4b8b884065ede76e07211ec8)
@@ -49,5 +49,5 @@
   !*********************************************
 
-  integer,parameter :: maxnests=1,nxmaxn=361,nymaxn=181
+  integer,parameter :: maxnests=0,nxmaxn=361,nymaxn=181
 
   ! nxmax,nymax        maximum dimension of wind fields in x and y
Index: src/mpi_mod.f90
===================================================================
--- src/mpi_mod.f90	(revision 341f4b7eb1c45f4749b96fc8dbea2dfff30140f2)
+++ src/mpi_mod.f90	(revision 62e65c73ae7e3d8c4b8b884065ede76e07211ec8)
@@ -103,5 +103,5 @@
   logical :: lmp_use_reader=.false. ! true if separate readwind process is used
 
-! true if only using synchronous MPI send/recv:
+! .true. if only using synchronous MPI send/recv (default)
 ! If setting this to .false., numwfmem must be set to 3
 !===============================================================================
@@ -208,9 +208,12 @@
 !*********************************************
 
-    if (.not.lmp_sync.and.numwfmem.ne.3.and.lroot) then
-      write(*,FMT='(80("#"))')
-      write(*,*) '#### mpi_mod::mpif_init> ERROR: ', &
-           & 'numwfmem must be set to 3 for asyncronous reading ####'
-      write(*,FMT='(80("#"))')
+    if (.not.lmp_sync.and.numwfmem.ne.3) then
+      if (lroot) then
+        write(*,FMT='(80("#"))')
+        write(*,*) '#### mpi_mod::mpif_init> ERROR: ', &
+             & 'numwfmem must be set to 3 for asyncronous reading ####'
+        write(*,FMT='(80("#"))')
+      end if
+      call MPI_FINALIZE(mp_ierr)
       stop
     else if (lmp_sync.and.numwfmem.ne.2.and.lroot) then
@@ -218,6 +221,6 @@
       write(*,*) '#### mpi_mod::mpif_init> WARNING: ', &
            & 'numwfmem should be set to 2 for syncronous'
-      write(*,*) ' reading. Results will still be valid, but unneccesary '
-      write(*,*) 'amount of memory is being allocated.'
+      write(*,*) ' reading. Results will still be valid, but unneccesary memory &
+           &is allocated.'
       write(*,FMT='(80("#"))')
 ! Force "syncronized" version if all processes will call getfields
Index: src/par_mod.f90
===================================================================
--- src/par_mod.f90	(revision 05cf28de9ff073ff7e3cdc064f0ed59c61a6dd09)
+++ src/par_mod.f90	(revision 62e65c73ae7e3d8c4b8b884065ede76e07211ec8)
@@ -89,5 +89,5 @@
   real,parameter :: rho_water=1000. !ZHG 2015 [kg/m3]
   !ZHG MAR2016
-  real,parameter :: incloud_ratio=2.2
+  real,parameter :: incloud_ratio=6.2
 
   ! karman                  Karman's constant
@@ -186,6 +186,6 @@
   !**************************************************
 
-  integer,parameter :: maxpart=1000000
-  integer,parameter :: maxspec=1
+  integer,parameter :: maxpart=20000000
+  integer,parameter :: maxspec=6
   real,parameter :: minmass=0.0001
 
Index: src/readpaths.f90
===================================================================
--- src/readpaths.f90	(revision 5f9d14aa526df192efa539f87fc409fdeeeee06c)
+++ src/readpaths.f90	(revision 62e65c73ae7e3d8c4b8b884065ede76e07211ec8)
@@ -82,6 +82,8 @@
 
   do i=1,maxnests
-    read(unitpath,'(a)') path(numpath+2*(i-1)+1)
-    read(unitpath,'(a)') path(numpath+2*(i-1)+2)
+  ! ESO 2016 Added 'end'/'err' in case user forgot '====' at end of file and
+  ! maxnests > numbnests
+    read(unitpath,'(a)', end=30, err=30) path(numpath+2*(i-1)+1)
+    read(unitpath,'(a)', end=30, err=30) path(numpath+2*(i-1)+2)
     if (path(numpath+2*(i-1)+1)(1:5).eq.'=====') goto 30
     length(numpath+2*(i-1)+1)=index(path(numpath+2*(i-1)+1),' ')-1
Index: src/readspecies.f90
===================================================================
--- src/readspecies.f90	(revision 05cf28de9ff073ff7e3cdc064f0ed59c61a6dd09)
+++ src/readspecies.f90	(revision 62e65c73ae7e3d8c4b8b884065ede76e07211ec8)
@@ -223,4 +223,11 @@
 
   if (lroot) then
+! ZHG 2016.04.07 Start of changes
+    write(*,*) ' '
+    if (dquer(pos_spec) .gt.0)  write(*,'(a,i3,a,a,a)')       ' SPECIES: ', &
+         &id_spec,'  ', species(pos_spec),'  (AEROSOL) '
+    if (dquer(pos_spec) .le.0)  write(*,'(a,i3,a,a,a)')       ' SPECIES: ', &
+         &id_spec,'  ', species(pos_spec),'  (GAS) '
+
 ! Particles
 !**********
