fixes and bootstrap added