A bit of progress, a bit of cleanup.