content edits based on comments, and I can't deal with this 80 column stuff