Improved build.sh