Added more to TODO
Reformatted README and TODO