diffusion tweaks; pasture/cropland
merge