comment and fixup