minor script tweaks for readability, possible fix for setup script