fixed TODOs. Information on github
minor