add comments, and regularlize others