More comment updates

[ci skip]