further improvements in build process