Fix typos and smooth over