more setup script tweaks