bugfixes in setup.sh