Better version control and slight alterations to build script