squashed some typos