some setup script improvements