Bootstrap upgrade

new branch with all of my modifications