Are these still a TODO? if so is it OK to leave it outside the scope of this PR?

I think the 2nd one is - we determined that this was too challenging and remains as a future improvement. But I'm less sure about the `epsilon_0` one.