Some work on the setup script.