IssueID #61: fix some comments