Update TODOs for diagrams with figure numbers; to be further updated with the figures when completed by production