Some updates to the scripts