More work on setup.sh