Fixed incorrect comments and names.
Wrote back a comment that shouldn't have been removed.
Merge pull request #613 from Morwenn/comments

Fixed incorrect comments and names.