Remove some TODOs, add notification