fixed all the comments