fixing #155 and #172
making setup.sh a bit nicer