A bit of work on markupengine.
Cleanup