Bootstrap script updates

I didn't mean to commit this, will remove