Fix small bugs

After you merge this, you can pull down the github branch locally by doing:
```
$ git pull origin uploading-images
```