Comment Cleanup

Some notes for the next phase of development, and clean-up of comments.