Many fixes to eg-case files