Rename some unknown fields
Fix some err_ret issues
Merge branch 'master' of https://github.com/lprot/epk2extract