Small improvements to bootstrap.sh.
More improvementes to bootstrap.sh.