updates to scripts to follow master