Updated TODOa and README