- improvements to bootstrap code