Put most TODO's in Notes.txt, did more consolidation