Todo and Readme Updated