minor tweak
more hax
minor tweaks to setup.sh