A number of improvements to make the scripts more deployable.