add support for headers and remove extra copy of license