WIP further improve bootstrap script