Fix for #22. Updates to code comment and spellings.