more setup script updates