merge in script improvements
build