build-script improved