More comments fixed