Yet another scarf update

[jamib]

I've hit the point where I feel like it's never going to be done, but at the same time the light is at the end of the tunnel and the deadline is closing in FAST!