Made the setup program better.