A little more revamping of the build process.
Adjusted the bootstrap process.