Fixed some typos
Added comments
Merge pull request #53 from jwenl/master

Added comments and small name changes