Update comments and change OK code