Better match their output.
A few small fixes.
Passing another test.