comment fixups