setup script improvements