Minor changes & TODOs
Update: Readme.md
Update: Readme.md
Update: Readme.md