Improving comments.
Updating file headers.
Fixing typo.
Merge pull request #1 from JanX2/master

Improvements