Wednesday fixes to comments

This should hopefully fix things some more. :cake: