Minor fixups, cleanups and comments