hud added, minor bootstrap refactoring