Added EMTF and INTF
Fixed bug in writing out component headings