changed bootstrap dir and other tweaks