Some fixes
Merge pull request #2 from bmneely/todo-code

Some fixes