completely reformulated 'TODO' in notes.txt
Merge branch 'meta'