Making some improvements to the setup script.