Improved bootstrap.sh