futher tweaks to improve build process