Little progress, mostly cleaning things up.