updates to streamline build process