A few fixes, then we're off to the races