agenda fixes and 2 TODOs