some todos added
todos adjusted
todos adjusted
todos adjusted
Merge pull request #10 from msat-cont/master

todos started