Update TODO.md
Update friscos
Merge with master