Fix some todos, add others (#3669)

As it says on the tin

Release Notes:

-
46bd6088e8Mikayla Maki committed on 12/15/2023, 3:00:58 AM· committed by GitHubparentsb52db696973b1b
5 files changedLine totals unavailable