some minor changes to scripts, see #901