fixed all comment