improve bootstrap.py