minor fixups, cosmetic and otherwise