Fixed error message

Minor change: fixed error message.
Minor fix to comments

Found a place where comments had not been updated after the
application's functionality changed.
Minor change - variable name coding convention
Minor fixes to comments

- Fixed comments that had not been updated after refactoring
Merge pull request #19 from rosemwahlin/master

Minor cleanup fixes - comments and variable names.