Updated TODO, adding some things and formatting others.