Minor fixes to setup script
See individual commit messages - stuff noticed when I hand-ran the steps in the script that I actually want, but using ssh root@localhost instead of sudo.
See individual commit messages - stuff noticed when I hand-ran the steps in the script that I actually want, but using ssh root@localhost instead of sudo.