More edits to the scripts