Updated the readme
Removed some todo markers