Augment the README
Update TODOs