Fix typos, improve flow