A lot of re-structuring of the text, better conventions for handling classes of text...