Further revisions to boostrapping, split into multiple scripts