Integrated bootstrap, a bit of clean up, fixes #2