Improve markup and fix typos