Improving comments.
Updating file headers.
Fixing typo.