Add comments, clean up spacing.
Merge branch 'more-comments' into working