Fixes and updates the README TODOs