edits and comments ready for review.

Have fun!