Lots of updates to the scripts