Corrected README.md and updated TODO section