Update copyright header for EDI
Fix several EDI bugs