More comment changes