Third attempt, more fixing typos in comments.