More work on the bootstrap script