bootstrap script improvements