Up[dated comments and authors to make sure consistent