V1 train eme fixes

This should bring some reliability into the v1-train everything.me.
I am not entirely sure but the HTML appears to have diverged a bit between the two. The changes have not been noticed because the tests were xfailed.

`master` -> do not merge
`v1-train` -> merge