Updated Readme and Todo