improvements on the bootstrap script