EFA code fixes, improvements and cleanup.