additions to todos
todos adjusted
Merge pull request #11 from msat-cont/master

todos added