minor todo changes
Merge pull request #2 from einhverfr/master

minor todo changes