Updated run script

Did a bit of cleaning up on the `run.py` script, see commit messages.