More comments fixes