Scripts/EoE: Phase 2 improvements

* still far from working