improvements to bootstrapper