Misc minor fixes of comments and variable names.