Added accidentally removed bootstrap file

and some minor changes