very minor work on conversations, added some TODOs to remind myself of work remaining.
Merge remote-tracking branch 'origin/master'