better paragraph treatment, better numbering