Minor fixes (mostly comments but one variable name as well).