Minor changes in comments and strings to address comments in PR 289.