Some updates to build script