minor adjustments
minor improvements for DTD