Implicit diffusion in some closures + playing with entrainment
clean up of directory
clean up of directory2