Commentary fixups