Updated todos
Removing old todo, fixed comments of delegate