Added some notes / TODOs.