commenting fixups