Various comment fixes