typos and tidy-up