More comment fixing