which.sh bugs fixed