bunch of bootstrap updates