Some fixes

Merge this into your github todo branch and then pull down to your local brand doing:

```bash
git pull origin todo-code
```