minor - readds things missed in previous MR

Thomas Morinrequested to merge
minor-fixups into main

There were a few comments by @rletrocquer that I had failed to integrate in !7 (merged)

This MR covers them, plus a bit more comment cleanups.

Edited by Thomas Morin

Merge request reports