bootstrap.sh tested and improved