More edits to scripts