lots of additions to setup.sh