A minor bug fix, and then a few cosmetic fixes.