Improved bootstrap design and fixed minor bugs