fixed some issues in setup.sh, some cleanup