comments, moved stuff around