changed bootstrap scripts to make them safer