typos and tidy up