Bootstrap changes

Stablised build and bootstrap changes made.