Updated markup and other small typos etc