Improved choclatey and bootstrap