Corrections to comments - instances where wrong terms were used, make comments more consistent