Tom's suggestions, typos