Minor changes (mostly shortening of build.sh)