Fix typo errors and add Jef's remarks