More work on getting setup.sh to function properly