Merge pull request #351 from mikeubell/master

Factor out handling of filer_id. Add more IEC data.
Comments and cleanup.