Fix README, add TODO

[Stories: ]