Explanatory comments part 2: Add a few more TODOs