improvements to bootstrap