Bug fixes, clarity added for Eflux2