Updating: improving scripts for building