Adjust for consistency. Fix some typos.