more script fixup