added some notes to TODO