add comments, subtract cruft