assigns all todos + some cleanup
Merge pull request #24 from xeno-by/master

assigns all todos + some cleanup