Fixed some more nuances with the shell script