improve bootstrap scripts