Update README.md

Updating TODOs and some formatting tweaks