add new bootcamp features, integrated some changes from master and updated the readme