review and resolve discussion todos