Fiddled the board xml by hand to place the last few parts. Some more adjustment of traces. Added a low-noise cap to the 5v regulator.