Logging added
Some other refinements
Working on a new evap formula