Removed NOTES.txt.
Updated TODO per recent developments.