Added references and notes to TODO