Significant changes

Some more formatting changes in the rng, almost at the point where I
can start updating the XML.