Minor fixups, add comments