added TODOs
Merge branch 'stable'