fixinf setup.sh some more...