updates to scripts to make them more uniform