MD handling fixes. Tracing, and creation of standard entries.