still more fixes to setup script.