mirroring EAF
minor errors in EAF