Comments and fixup