Major changes to extensive install, minor change to minimal install.