The rest of the conversion to markup
A fixing a few typos